Reconcile with jb-dev - do not merge
Change-Id: I4fe061acee132eb26230fa7c9a2984217da9ad75
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b6f829f..2b068d6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -43,6 +43,7 @@
TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi
TARGET_CPU_SMP := true
+TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a
ARCH_ARM_HAVE_TLS_REGISTER := true
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index e7ecd41..4db78d3 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -25,17 +25,27 @@
# 262866 = IMM30D
# 299849 = IMM76D
# end ics-mr1
-BRANCH=ics-mr1
+# start jb-dev
+# 405518 = JRO03H
+# 438695 = JRO03R
+# 485486 = JZO54K
+# end jb-dev
+BRANCH=jb-dev
if test $BRANCH=ics-mr1
then
ZIP=tervigon-ota-299849.zip
BUILD=imm76d
fi # ics-mr1
+if test $BRANCH=jb-dev
+then
+ ZIP=tervigon-ota-485486.zip
+ BUILD=jzo54k
+fi # jb-dev
ROOTDEVICE=stingray
DEVICE=wingray
MANUFACTURER=moto
-for COMPANY in nvidia broadcom
+for COMPANY in nvidia broadcom moto
do
echo Processing files from $COMPANY
rm -rf tmp
@@ -50,6 +60,11 @@
system/vendor/firmware/fw_bcm4329_mfg.bin
"
;;
+ moto)
+ TO_EXTRACT="\
+ system/lib/hw/camera.stingray.so
+ "
+ ;;
nvidia)
TO_EXTRACT="\
system/etc/firmware/nvmm_aacdec.axf \
@@ -70,8 +85,11 @@
system/etc/firmware/nvmm_sw_mp3dec.axf \
system/etc/firmware/nvmm_wavdec.axf \
system/etc/firmware/nvrm_avp.bin \
+ system/lib/egl/libEGL_perfhud.so \
system/lib/egl/libEGL_tegra.so \
+ system/lib/egl/libGLESv1_CM_perfhud.so \
system/lib/egl/libGLESv1_CM_tegra.so \
+ system/lib/egl/libGLESv2_perfhud.so \
system/lib/egl/libGLESv2_tegra.so \
system/lib/hw/gralloc.tegra.so \
system/lib/hw/hwcomposer.tegra.so \
@@ -90,6 +108,8 @@
system/lib/libnvmm_tracklist.so \
system/lib/libnvmm_utils.so \
system/lib/libnvmm_video.so \
+ system/lib/libnvodm_imager.so \
+ system/lib/libnvodm_query.so \
system/lib/libnvomx.so \
system/lib/libnvomxilclient.so \
system/lib/libnvos.so \
@@ -111,14 +131,6 @@
then
chmod a+x $FILEDIR/$(basename $ONE_FILE) || echo \ \ \ \ Error chmoding $ONE_FILE
fi
- if test $(echo $ONE_FILE | grep \\.apk\$ | wc -l) = 1
- then
- echo \ \ \ \ Splitting $ONE_FILE
- mkdir -p $FILEDIR/$(basename $ONE_FILE).parts || echo \ \ \ \ Error making parts dir for $ONE_FILE
- unzip $FILEDIR/$(basename $ONE_FILE) -d $FILEDIR/$(basename $ONE_FILE).parts > /dev/null || echo \ \ \ \ Error unzipping $ONE_FILE
- rm $FILEDIR/$(basename $ONE_FILE) || echo \ \ \ \ Error removing original $ONE_FILE
- rm -rf $FILEDIR/$(basename $ONE_FILE).parts/META-INF || echo \ \ \ \ Error removing META-INF for $ONE_FILE
- fi
done
echo \ \ Setting up $COMPANY-specific makefiles
cp -R $COMPANY/staging/* tmp/vendor/$COMPANY/$DEVICE || echo \ \ \ \ Error copying makefiles
diff --git a/self-extractors/moto/COPYRIGHT b/self-extractors/moto/COPYRIGHT
new file mode 100644
index 0000000..abd2ffd
--- /dev/null
+++ b/self-extractors/moto/COPYRIGHT
@@ -0,0 +1 @@
+# (C) Motorola - All Rights Reserved
diff --git a/self-extractors/moto/LICENSE b/self-extractors/moto/LICENSE
new file mode 100644
index 0000000..9a204a6
--- /dev/null
+++ b/self-extractors/moto/LICENSE
@@ -0,0 +1 @@
+MOTOROLA LICENSE GOES HERE
diff --git a/self-extractors/moto/staging/BoardConfigWingray.mk b/self-extractors/moto/staging/BoardConfigWingray.mk
new file mode 100644
index 0000000..851a7a8
--- /dev/null
+++ b/self-extractors/moto/staging/BoardConfigWingray.mk
@@ -0,0 +1,13 @@
+# 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.
diff --git a/self-extractors/moto/staging/device-wingray.mk b/self-extractors/moto/staging/device-wingray.mk
new file mode 100644
index 0000000..34b8be2
--- /dev/null
+++ b/self-extractors/moto/staging/device-wingray.mk
@@ -0,0 +1,19 @@
+# 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 := vendor/moto/wingray
+
+# Motorola blobnecessary for wingray hardware
+PRODUCT_COPY_FILES := \
+ $(LOCAL_PATH)/proprietary/camera.stingray.so:system/lib/hw/camera.stingray.so
diff --git a/self-extractors/nvidia/staging/device-wingray.mk b/self-extractors/nvidia/staging/device-wingray.mk
index 8ef8941..eb42b6d 100644
--- a/self-extractors/nvidia/staging/device-wingray.mk
+++ b/self-extractors/nvidia/staging/device-wingray.mk
@@ -34,8 +34,11 @@
$(LOCAL_PATH)/proprietary/nvmm_sw_mp3dec.axf:system/etc/firmware/nvmm_sw_mp3dec.axf \
$(LOCAL_PATH)/proprietary/nvmm_wavdec.axf:system/etc/firmware/nvmm_wavdec.axf \
$(LOCAL_PATH)/proprietary/nvrm_avp.bin:system/etc/firmware/nvrm_avp.bin \
+ $(LOCAL_PATH)/proprietary/libEGL_perfhud.so:system/lib/egl/libEGL_perfhud.so \
$(LOCAL_PATH)/proprietary/libEGL_tegra.so:system/lib/egl/libEGL_tegra.so \
+ $(LOCAL_PATH)/proprietary/libGLESv1_CM_perfhud.so:system/lib/egl/libGLESv1_CM_perfhud.so \
$(LOCAL_PATH)/proprietary/libGLESv1_CM_tegra.so:system/lib/egl/libGLESv1_CM_tegra.so \
+ $(LOCAL_PATH)/proprietary/libGLESv2_perfhud.so:system/lib/egl/libGLESv2_perfhud.so \
$(LOCAL_PATH)/proprietary/libGLESv2_tegra.so:system/lib/egl/libGLESv2_tegra.so \
$(LOCAL_PATH)/proprietary/gralloc.tegra.so:system/lib/hw/gralloc.tegra.so \
$(LOCAL_PATH)/proprietary/hwcomposer.tegra.so:system/lib/hw/hwcomposer.tegra.so \
@@ -54,6 +57,8 @@
$(LOCAL_PATH)/proprietary/libnvmm_tracklist.so:system/lib/libnvmm_tracklist.so \
$(LOCAL_PATH)/proprietary/libnvmm_utils.so:system/lib/libnvmm_utils.so \
$(LOCAL_PATH)/proprietary/libnvmm_video.so:system/lib/libnvmm_video.so \
+ $(LOCAL_PATH)/proprietary/libnvodm_imager.so:system/lib/libnvodm_imager.so \
+ $(LOCAL_PATH)/proprietary/libnvodm_query.so:system/lib/libnvodm_query.so \
$(LOCAL_PATH)/proprietary/libnvomx.so:system/lib/libnvomx.so \
$(LOCAL_PATH)/proprietary/libnvomxilclient.so:system/lib/libnvomxilclient.so \
$(LOCAL_PATH)/proprietary/libnvos.so:system/lib/libnvos.so \
diff --git a/self-extractors/root/BoardConfigVendor.mk b/self-extractors/root/BoardConfigVendor.mk
index 4dd06a0..7a5611f 100644
--- a/self-extractors/root/BoardConfigVendor.mk
+++ b/self-extractors/root/BoardConfigVendor.mk
@@ -15,4 +15,5 @@
LOCAL_STEM := wingray/BoardConfigWingray.mk
-include vendor/broadcom/$(LOCAL_STEM)
+-include vendor/moto/$(LOCAL_STEM)
-include vendor/nvidia/$(LOCAL_STEM)
diff --git a/self-extractors/root/wingray-vendor.mk b/self-extractors/root/wingray-vendor.mk
index 0c686ff..da36421 100644
--- a/self-extractors/root/wingray-vendor.mk
+++ b/self-extractors/root/wingray-vendor.mk
@@ -15,4 +15,5 @@
LOCAL_STEM := wingray/device-wingray.mk
$(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/moto/$(LOCAL_STEM))
$(call inherit-product-if-exists, vendor/nvidia/$(LOCAL_STEM))
diff --git a/taudio/Android.mk b/taudio/Android.mk
index 04c25d3..3363c4a 100644
--- a/taudio/Android.mk
+++ b/taudio/Android.mk
@@ -22,12 +22,10 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= twav.c
-LOCAL_MODULE_TAGS:= eng
LOCAL_MODULE:= twav
include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= resample.c
-LOCAL_MODULE_TAGS:= eng
LOCAL_MODULE:= tdownsample
include $(BUILD_HOST_EXECUTABLE)
