diff --git a/copy-files.sh b/copy-files.sh new file mode 100755 index 0000000..37596f6 --- /dev/null +++ b/copy-files.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +# 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. + +DEVICE=leo +MANUFACTURER=htc +STAGESYS=~/cm-$DEVICE/system + +if [ "$1" = "pull" ]; then + if [ -s "$STAGESYS" ]; then + rm -R ~/cm-$DEVICE + fi + mkdir ~/cm-$DEVICE + mkdir $STAGESYS + mkdir $STAGESYS/bin + mkdir $STAGESYS/lib + mkdir $STAGESYS/etc + adb pull /system/bin $STAGESYS/bin + adb pull /system/lib $STAGESYS/lib + adb pull /system/etc $STAGESYS/etc +fi + +OUTDIR=../../../vendor/$MANUFACTURER/$DEVICE +BASE=$OUTDIR/proprietary +rm -rf $BASE/* + +for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do + DIR=`dirname $FILE` + if [ ! -d $BASE/$DIR ]; then + mkdir -p $BASE/$DIR + fi + cp $STAGESYS/$FILE $BASE/$FILE +done + +./setup-makefiles.sh diff --git a/proprietary-files.txt b/proprietary-files.txt index b290d34..33cb701 100755 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,5 +1,6 @@ bin/akmd bin/parse_radio_log +bin/vold etc/AudioBTID.csv etc/AdieHWCodecSetting.csv etc/firmware/BCM4329B1_002.002.023.0360.0362.hcd @@ -15,6 +16,7 @@ lib/egl/libEGL_adreno200.so lib/egl/libGLESv1_CM_adreno200.so lib/egl/libGLESv2_adreno200.so lib/egl/libq3dtools_adreno200.so +lib/libaudio.so lib/libcamera.so lib/libgsl.so lib/libhtc_acoustic.so @@ -23,4 +25,6 @@ lib/liboemcamera.so lib/libOmxVdec.so lib/libOmxVidEnc.so lib/libOmxCore.so -lib/libmm-omxcore.so +lib/hw/gps.htcleo.so +lib/hw/gps.leo.so +lib/hw/sensors.bravo.so diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 197a22d..c971cca 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -40,7 +40,7 @@ MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk # Prebuilt libraries that are needed to build open-source libraries PRODUCT_COPY_FILES := \\ - $OUTDIR/proprietary/libcamera.so:obj/lib/libcamera.so + $OUTDIR/proprietary/lib/libcamera.so:obj/lib/libcamera.so # All the blobs necessary for leo PRODUCT_COPY_FILES += \\ diff --git a/unzip-files.sh b/unzip-files.sh index 86a684c..09804b9 100755 --- a/unzip-files.sh +++ b/unzip-files.sh @@ -15,71 +15,18 @@ # limitations under the License. DEVICE=leo +MANUFACTURER=htc -mkdir -p ../../../vendor/htc/$DEVICE/proprietary -unzip -j -o ../../../${DEVICE}_update.zip system/bin/akmd system/bin/mm-venc-omx-test system/bin/parse_radio_log system/etc/01_qcomm_omx.cfg system/etc/AudioBTID.csv system/etc/firmware/bcm4329.hcd system/etc/firmware/default.acdb system/etc/firmware/default_nel.acdb system/etc/firmware/default_france.acdb system/etc/firmware/fw_bcm4329_apsta.bin system/etc/firmware/fw_bcm4329.bin system/etc/firmware/yamato_pfp.fw system/etc/firmware/yamato_pm4.fw system/lib/egl/libEGL_adreno200.so system/lib/egl/libGLESv1_CM_adreno200.so system/lib/egl/libGLESv2_adreno200.so system/lib/egl/libq3dtools_adreno200.so system/lib/libcamera.so system/lib/libgps.so system/lib/libgsl.so system/lib/libhtc_acoustic.so system/lib/libhtc_ril.so system/lib/liblvmxipc.so system/lib/liboemcamera.so system/lib/libOmxVdec.so system/lib/libomx_wmadec_sharedlibrary.so system/lib/libomx_wmvdec_sharedlibrary.so system/lib/libpvasfcommon.so system/lib/libpvasflocalpbreg.so system/lib/libpvasflocalpb.so system/etc/pvasflocal.cfg -d ../../../vendor/htc/$DEVICE/proprietary -chmod 755 ../../../vendor/htc/$DEVICE/proprietary/akmd -chmod 755 ../../../vendor/htc/$DEVICE/proprietary/mm-venc-omx-test -chmod 755 ../../../vendor/htc/$DEVICE/proprietary/parse_radio_log +OUTDIR=../../../vendor/$MANUFACTURER/$DEVICE +BASE=$OUTDIR/proprietary +rm -rf $BASE/* -(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/$DEVICE-vendor-blobs.mk -# 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. - -# This file is generated by device/htc/__DEVICE__/extract-files.sh - -# Prebuilt libraries that are needed to build open-source libraries -PRODUCT_COPY_FILES := \\ - vendor/htc/__DEVICE__/proprietary/libcamera.so:obj/lib/libcamera.so - -# All the blobs necessary for leo -PRODUCT_COPY_FILES += \\ - vendor/htc/__DEVICE__/proprietary/akmd:/system/bin/akmd \\ - vendor/htc/__DEVICE__/proprietary/mm-venc-omx-test:/system/bin/mm-venc-omx-test \\ - vendor/htc/__DEVICE__/proprietary/parse_radio_log:/system/bin/parse_radio_log \\ - vendor/htc/__DEVICE__/proprietary/01_qcomm_omx.cfg:/system/etc/01_qcomm_omx.cfg \\ - vendor/htc/__DEVICE__/proprietary/AudioBTID.csv:/system/etc/AudioBTID.csv \\ - vendor/htc/__DEVICE__/proprietary/bcm4329.hcd:/system/etc/firmware/bcm4329.hcd \\ - vendor/htc/__DEVICE__/proprietary/default.acdb:/system/etc/firmware/default.acdb \\ - vendor/htc/__DEVICE__/proprietary/default_france.acdb:/system/etc/firmware/default_france.acdb \\ - vendor/htc/__DEVICE__/proprietary/default_nel.acdb:/system/etc/firmware/default_nel.acdb \\ - vendor/htc/__DEVICE__/proprietary/fw_bcm4329_apsta.bin:/system/etc/firmware/fw_bcm4329_apsta.bin \\ - vendor/htc/__DEVICE__/proprietary/fw_bcm4329.bin:/system/etc/firmware/fw_bcm4329.bin \\ - vendor/htc/__DEVICE__/proprietary/yamato_pfp.fw:/system/etc/firmware/yamato_pfp.fw \\ - vendor/htc/__DEVICE__/proprietary/yamato_pm4.fw:/system/etc/firmware/yamato_pm4.fw \\ - vendor/htc/__DEVICE__/proprietary/libEGL_adreno200.so:/system/lib/egl/libEGL_adreno200.so \\ - vendor/htc/__DEVICE__/proprietary/libGLESv1_CM_adreno200.so:/system/lib/egl/libGLESv1_CM_adreno200.so \\ - vendor/htc/__DEVICE__/proprietary/libGLESv2_adreno200.so:/system/lib/egl/libGLESv2_adreno200.so \\ - vendor/htc/__DEVICE__/proprietary/libq3dtools_adreno200.so:/system/lib/egl/libq3dtools_adreno200.so \\ - vendor/htc/__DEVICE__/proprietary/libcamera.so:/system/lib/libcamera.so \\ - vendor/htc/__DEVICE__/proprietary/libgsl.so:/system/lib/libgsl.so \\ - vendor/htc/__DEVICE__/proprietary/libhtc_acoustic.so:/system/lib/libhtc_acoustic.so \\ - vendor/htc/__DEVICE__/proprietary/libhtc_ril.so:/system/lib/libhtc_ril.so \\ - vendor/htc/__DEVICE__/proprietary/liblvmxipc.so:/system/lib/liblvmxipc.so \\ - vendor/htc/__DEVICE__/proprietary/liboemcamera.so:/system/lib/liboemcamera.so \\ - vendor/htc/__DEVICE__/proprietary/libOmxVdec.so:/system/lib/libOmxVdec.so - -ifdef WITH_WINDOWS_MEDIA -PRODUCT_COPY_FILES += \\ - vendor/htc/__DEVICE__/proprietary/libomx_wmadec_sharedlibrary.so:system/lib/libomx_wmadec_sharedlibrary.so \\ - vendor/htc/__DEVICE__/proprietary/libomx_wmvdec_sharedlibrary.so:system/lib/libomx_wmvdec_sharedlibrary.so \\ - vendor/htc/__DEVICE__/proprietary/libpvasfcommon.so:system/lib/libpvasfcommon.so \\ - vendor/htc/__DEVICE__/proprietary/libpvasflocalpbreg.so:system/lib/libpvasflocalpbreg.so \\ - vendor/htc/__DEVICE__/proprietary/libpvasflocalpb.so:system/lib/libpvasflocalpb.so \\ - vendor/htc/__DEVICE__/proprietary/pvasflocal.cfg:system/etc/pvasflocal.cfg -endif - -EOF +for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do + DIR=`dirname $FILE` + if [ ! -d $BASE/$DIR ]; then + mkdir -p $BASE/$DIR + fi + unzip -j -o ../../../${DEVICE}_update.zip system/$FILE -d $BASE/$DIR +done ./setup-makefiles.sh