Handle last batch of unknown files.
Also update to JZO54G
Bug: 4295425
Change-Id: Ie8a63e75ffc94184f3be28f0c5732b104f9bf1cd
diff --git a/self-extractors/asus/staging/device-partial.mk b/self-extractors/asus/staging/device-partial.mk
index 198031c..300c7e8 100644
--- a/self-extractors/asus/staging/device-partial.mk
+++ b/self-extractors/asus/staging/device-partial.mk
@@ -15,7 +15,9 @@
# Asus blob(s) necessary for Grouper hardware
PRODUCT_PACKAGES := \
btmacreader \
+ sensors-config \
camera.tegra3 \
+ sensors.grouper \
libsensors.lightsensor \
libdrmwvmplugin \
libwvm
diff --git a/self-extractors/asus/staging/proprietary/Android.mk b/self-extractors/asus/staging/proprietary/Android.mk
index 5fff521..bf21833 100644
--- a/self-extractors/asus/staging/proprietary/Android.mk
+++ b/self-extractors/asus/staging/proprietary/Android.mk
@@ -26,6 +26,15 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := sensors-config
+LOCAL_SRC_FILES := sensors-config
+LOCAL_MODULE_CLASS := EXECUTABLES
+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_SRC_FILES := camera.tegra3.so
LOCAL_MODULE_SUFFIX := .so
@@ -36,6 +45,16 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := sensors.grouper
+LOCAL_SRC_FILES := sensors.grouper.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+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_SRC_FILES := libsensors.lightsensor.so
LOCAL_MODULE_SUFFIX := .so
diff --git a/self-extractors/broadcom/staging/device-partial.mk b/self-extractors/broadcom/staging/device-partial.mk
index bc82252..c0b867b 100644
--- a/self-extractors/broadcom/staging/device-partial.mk
+++ b/self-extractors/broadcom/staging/device-partial.mk
@@ -15,6 +15,6 @@
# Broadcom blob(s) necessary for Grouper hardware
PRODUCT_PACKAGES := \
glgps \
- bcm4330
-PRODUCT_PACKAGES := \
+ gps.tegra3 \
+ gpsconfig \
bcm4330
diff --git a/self-extractors/broadcom/staging/proprietary/Android.mk b/self-extractors/broadcom/staging/proprietary/Android.mk
index 885748d..4d54414 100644
--- a/self-extractors/broadcom/staging/proprietary/Android.mk
+++ b/self-extractors/broadcom/staging/proprietary/Android.mk
@@ -23,7 +23,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := broadcom
-#include $(BUILD_PREBUILT)
+include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := bcm4330
@@ -35,4 +35,24 @@
LOCAL_MODULE_OWNER := broadcom
include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := gpsconfig
+LOCAL_SRC_FILES := gpsconfig.xml
+LOCAL_MODULE_SUFFIX := .xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/gps
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := broadcom
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := gps.tegra3
+LOCAL_SRC_FILES := gps.tegra3.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := broadcom
+include $(BUILD_PREBUILT)
+
endif
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 057558d..cab4651 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -23,18 +23,19 @@
# 397816 = JRO03B
# 398337 = JRO03C
# 405518 = JRO03H
+# 463694 = JZO54G
# end jb-dev
BRANCH=jb-dev
if test $BRANCH=jb-dev
then
- ZIP=nakasi-ota-405518.zip
- BUILD=jro03h
+ ZIP=nakasi-ota-463694.zip
+ BUILD=jzo54g
fi # jb-dev
ROOTDEVICE=grouper
DEVICE=grouper
MANUFACTURER=asus
-for COMPANY in asus broadcom elan invensense nvidia nxp trusted_logic widevine unknown
+for COMPANY in asus broadcom elan invensense nvidia nxp trusted_logic widevine
do
echo Processing files from $COMPANY
rm -rf tmp
@@ -45,20 +46,20 @@
asus)
TO_EXTRACT="\
system/bin/btmacreader \
+ system/bin/sensors-config \
system/lib/hw/camera.tegra3.so \
+ system/lib/hw/sensors.grouper.so \
system/lib/libsensors.lightsensor.so \
system/vendor/lib/drm/libdrmwvmplugin.so \
system/vendor/lib/libwvm.so \
"
;;
- broadcom_gps)
- TO_EXTRACT="\
- system/bin/glgps \
- "
- ;;
broadcom)
TO_EXTRACT="\
+ system/bin/glgps \
system/etc/firmware/bcm4330.hcd \
+ system/etc/gps/gpsconfig.xml \
+ system/lib/hw/gps.tegra3.so \
"
;;
elan)
@@ -150,15 +151,6 @@
system/vendor/lib/libWVStreamControlAPI_L1.so
"
;;
- unknown)
- TO_EXTRACT="\
- system/bin/sensors-config \
- system/etc/asound.conf \
- system/etc/gps/gpsconfig.xml \
- system/lib/hw/gps.tegra3.so \
- system/lib/hw/sensors.grouper.so \
- "
- ;;
esac
echo \ \ Extracting files from OTA package
for ONE_FILE in $TO_EXTRACT
diff --git a/self-extractors/unknown/COPYRIGHT b/self-extractors/unknown/COPYRIGHT
deleted file mode 100644
index 7b0e341..0000000
--- a/self-extractors/unknown/COPYRIGHT
+++ /dev/null
@@ -1 +0,0 @@
-# (C) ASUS and others. All Rights Reserved.
diff --git a/self-extractors/unknown/LICENSE b/self-extractors/unknown/LICENSE
deleted file mode 100644
index 4247f9f..0000000
--- a/self-extractors/unknown/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE GOES HERE
diff --git a/self-extractors/unknown/staging/BoardConfigPartial.mk b/self-extractors/unknown/staging/BoardConfigPartial.mk
deleted file mode 100644
index 01a0ff3..0000000
--- a/self-extractors/unknown/staging/BoardConfigPartial.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/self-extractors/unknown/staging/device-partial.mk b/self-extractors/unknown/staging/device-partial.mk
deleted file mode 100644
index 8ce6694..0000000
--- a/self-extractors/unknown/staging/device-partial.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.
-
-# blob(s) necessary for Grouper hardware
-PRODUCT_PACKAGES := \
- sensors-config \
- asound \
- gps.tegra3 \
- gpsconfig \
- sensors.grouper
diff --git a/self-extractors/unknown/staging/proprietary/Android.mk b/self-extractors/unknown/staging/proprietary/Android.mk
deleted file mode 100644
index a20994f..0000000
--- a/self-extractors/unknown/staging/proprietary/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (C) 2011 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.
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),grouper)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sensors-config
-LOCAL_SRC_FILES := sensors-config
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := asound
-LOCAL_SRC_FILES := asound.conf
-LOCAL_MODULE_SUFFIX := .conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := gpsconfig
-LOCAL_SRC_FILES := gpsconfig.xml
-LOCAL_MODULE_SUFFIX := .xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/gps
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := gps.tegra3
-LOCAL_SRC_FILES := gps.tegra3.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sensors.grouper
-LOCAL_SRC_FILES := sensors.grouper.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-endif
