Kaik541 · rlsmith872 · Oct 13, 2012 · Oct 15, 2012 · Oct 26, 2012 · Oct 26, 2012
diff --git a/grouper/BoardConfigPartial.mk b/grouper/BoardConfigPartial.mk
@@ -0,0 +1,13 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/grouper/BoardConfigVendor.mk b/grouper/BoardConfigVendor.mk
@@ -20,7 +20,4 @@ LOCAL_STEM := grouper/BoardConfigPartial.mk
 -include vendor/invensense/$(LOCAL_STEM)
 -include vendor/nvidia/$(LOCAL_STEM)
 -include vendor/nxp/$(LOCAL_STEM)
--include vendor/trusted_logic/$(LOCAL_STEM)
 -include vendor/widevine/$(LOCAL_STEM)
-
--include vendor/unknown/$(LOCAL_STEM)
diff --git a/grouper/device-partial.mk b/grouper/device-partial.mk
@@ -14,14 +14,10 @@
 
 # Asus blob(s) necessary for Grouper hardware
 PRODUCT_PACKAGES := \
-    asound \
     btmacreader \
+    sensors-config \
     camera.tegra3 \
-    keystore.grouper \
-    libdrmwvmplugin \
-    libpn544_fw \
-    libsensors.lightsensor \
-    libwvm \
     sensors.grouper \
-    sensors-config \
-    tf_daemon
+    libsensors.lightsensor \
+    libdrmwvmplugin \
+    libwvm
diff --git a/grouper/device-vendor.mk b/grouper/device-vendor.mk
@@ -20,9 +20,6 @@ $(call inherit-product-if-exists, vendor/elan/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/invensense/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/nvidia/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/nxp/$(LOCAL_STEM))
-$(call inherit-product-if-exists, vendor/trusted_logic/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/widevine/$(LOCAL_STEM))
 
-$(call inherit-product-if-exists, vendor/unknown/$(LOCAL_STEM))
-
 PRODUCT_RESTRICT_VENDOR_FILES := owner
diff --git a/grouper/proprietary/Android.mk b/grouper/proprietary/Android.mk
@@ -17,100 +17,71 @@ LOCAL_PATH := $(call my-dir)
 ifeq ($(TARGET_DEVICE),grouper)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := asound
-LOCAL_MODULE_OWNER := nvidia
-LOCAL_SRC_FILES := asound.conf
+LOCAL_MODULE := btmacreader
+LOCAL_SRC_FILES := btmacreader
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc
+LOCAL_MODULE_OWNER := asus
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := btmacreader   
-LOCAL_MODULE_OWNER := broadcom
-LOCAL_SRC_FILES := btmacreader
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := sensors-config
+LOCAL_SRC_FILES := sensors-config
 LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
+LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := asus
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := camera.tegra3
-LOCAL_MODULE_OWNER := nvidia
 LOCAL_SRC_FILES := camera.tegra3.so
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/hw
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrmwvmplugin   
-LOCAL_MODULE_OWNER := widevine
-LOCAL_SRC_FILES := libdrmwvmplugin.so
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/drm
+LOCAL_MODULE_OWNER := asus
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libpn544_fw
-LOCAL_MODULE_OWNER := nxp
-LOCAL_SRC_FILES := libpn544_fw.so
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := sensors.grouper
+LOCAL_SRC_FILES := sensors.grouper.so
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := asus
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libsensors.lightsensor   
-LOCAL_MODULE_OWNER := asus
+LOCAL_MODULE := libsensors.lightsensor
 LOCAL_SRC_FILES := libsensors.lightsensor.so
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwvm   
-LOCAL_MODULE_OWNER := widevine
-LOCAL_SRC_FILES := libwvm.so
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+LOCAL_MODULE_OWNER := asus
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := sensors.grouper   
-LOCAL_MODULE_OWNER := asus
-LOCAL_SRC_FILES := sensors.grouper.so
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libdrmwvmplugin
+LOCAL_SRC_FILES := libdrmwvmplugin.so
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/hw
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sensors-config   
-LOCAL_MODULE_OWNER := nvidia
-LOCAL_SRC_FILES := sensors-config
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/drm
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
+LOCAL_MODULE_OWNER := asus
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := tf_daemon   
-LOCAL_MODULE_OWNER := nvidia
-LOCAL_SRC_FILES := tf_daemon
+LOCAL_MODULE := libwvm
+LOCAL_SRC_FILES := libwvm.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
+LOCAL_MODULE_OWNER := asus
 include $(BUILD_PREBUILT)
 
 endif
diff --git a/grouper/proprietary/asound.conf b/grouper/proprietary/asound.conf
diff --git a/grouper/proprietary/btmacreader b/grouper/proprietary/btmacreader
diff --git a/grouper/proprietary/camera.tegra3.so b/grouper/proprietary/camera.tegra3.so
diff --git a/grouper/proprietary/libdrmwvmplugin.so b/grouper/proprietary/libdrmwvmplugin.so
diff --git a/grouper/proprietary/libpn544_fw.so b/grouper/proprietary/libpn544_fw.so
diff --git a/grouper/proprietary/libsensors.lightsensor.so b/grouper/proprietary/libsensors.lightsensor.so
diff --git a/grouper/proprietary/libwvm.so b/grouper/proprietary/libwvm.so
diff --git a/grouper/proprietary/sensors-config b/grouper/proprietary/sensors-config
diff --git a/grouper/proprietary/sensors.grouper.so b/grouper/proprietary/sensors.grouper.so
diff --git a/tf101/tf101-vendor-blobs.mk b/tf101/tf101-vendor-blobs.mk
@@ -48,6 +48,8 @@ PRODUCT_COPY_FILES += \
     vendor/asus/tf101/proprietary/lib/egl/libEGL_perfhud.so:system/lib/egl/libEGL_perfhud.so \
     vendor/asus/tf101/proprietary/lib/egl/libGLESv1_CM_perfhud.so:system/lib/egl/libGLESv1_CM_perfhud.so \
     vendor/asus/tf101/proprietary/lib/egl/libGLESv2_perfhud.so:system/lib/egl/libGLESv2_perfhud.so \
+    vendor/asus/tf101/proprietary/lib/hw/audio.primary.tegra.so:system/lib/hw/audio.primary.tegra.so \
+    vendor/asus/tf101/proprietary/lib/hw/audio_policy.tegra.so:system/lib/hw/audio_policy.tegra.so \
     vendor/asus/tf101/proprietary/lib/hw/camera.tegra.so:system/lib/hw/camera.tegra.so \
     vendor/asus/tf101/proprietary/lib/hw/gps.ventana.so:system/lib/hw/gps.ventana.so \
     vendor/asus/tf101/proprietary/lib/hw/gralloc.tegra.so:system/lib/hw/gralloc.tegra.so \

diff --git a/tf201/proprietary/bin/glgps b/tf201/proprietary/bin/glgps
diff --git a/tf201/proprietary/bin/sensors-config b/tf201/proprietary/bin/sensors-config
diff --git a/grouper/proprietary/tf_daemon → tf201/proprietary/bin/tf_daemon b/grouper/proprietary/tf_daemon → tf201/proprietary/bin/tf_daemon