From ae8c5a1976552e594c9164aa9b737636c88e806f Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Tue, 22 Dec 2015 19:36:57 +0100 Subject: espresso-common: use common proprietary-files - use vendor/samsung/espresso-common if exist - remove domx and camera blobs which are build from source now: system/lib/hw/vendor-camera.piranha.so system/lib/libI420colorconvert.so system/lib/libOMX.TI.DUCATI1.MISC.SAMPLE.so system/lib/libOMX.TI.DUCATI1.VIDEO.CAMERA.so system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.secure.so system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.so system/lib/libOMX.TI.DUCATI1.VIDEO.H264E.so system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so system/lib/libOMX_Core.so system/lib/libdomx.so system/lib/libion.omap4.so system/lib/libmm_osal.so system/lib/libtiutils.so - remove sensor blobs which are build from source now (Note: p5100 and p5110 share sensor blobs, p3100 and p3110 don't) system/bin/geomagneticd system/bin/orientationd system/lib/hw/sensors.omap4.so - gps and drm parts changed too, but don't reflect those changes here since we can't pull blobs from other devices if we don't own them Change-Id: Ieae3db1d530647a5c2401028bb6f5af7667cc0d9 --- espresso-common.mk | 1 + extract-files.sh | 108 ++++++++++++++++++++++++++++++++++++++++++++ proprietary-files.txt | 15 ++++++ proprietary-p31xx-files.txt | 30 ------------ proprietary-p51xx-files.txt | 31 ------------- 5 files changed, 124 insertions(+), 61 deletions(-) create mode 100755 extract-files.sh create mode 100644 proprietary-files.txt diff --git a/espresso-common.mk b/espresso-common.mk index b65c0f7..141ea69 100644 --- a/espresso-common.mk +++ b/espresso-common.mk @@ -161,6 +161,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_TAGS += dalvik.gc.type-precise +$(call inherit-product-if-exists, vendor/samsung/espresso-common/espresso-common-vendor.mk) $(call inherit-product-if-exists, vendor/samsung/omap4-common/common-vendor.mk) $(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk) $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk) diff --git a/extract-files.sh b/extract-files.sh new file mode 100755 index 0000000..cf2ec05 --- /dev/null +++ b/extract-files.sh @@ -0,0 +1,108 @@ +#!/bin/sh + +# Copyright (C) 2013 The CyanogenMod Project +# Copyright (C) 2015 SlimRoms +# +# 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. + +VENDOR=samsung +COMMON=espresso-common +COMMONOUTDIR=vendor/$VENDOR/$COMMON +COMMONBASE=../../../$COMMONOUTDIR/proprietary +COMMONMAKEFILE=../../../$COMMONOUTDIR/common-vendor-blobs.mk +COMMONPROPS=../$COMMON/proprietary-files.txt + +mkdir -p ../../../vendor/$VENDOR/$COMMON/proprietary + +adb root +adb wait-for-device + +echo "Pulling common files..." +for FILE in `cat $COMMONPROPS | grep -v ^# | grep -v ^$`; do + DIR=`dirname $FILE` + if [ ! -d $COMMONBASE/$DIR ]; then + mkdir -p $COMMONBASE/$DIR + fi + adb pull /$FILE $COMMONBASE/$FILE +done + + +(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__VENDOR__/$VENDOR/g > $COMMONMAKEFILE +# Copyright (C) 2015 SlimRoms +# +# 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/samsung/__COMMON__ + +PRODUCT_COPY_FILES += \\ +EOF + +LINEEND=" \\" +COUNT=`cat $COMMONPROPS | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}` +for FILE in `cat $COMMONPROPS | grep -v ^# | grep -v ^$`; do + COUNT=`expr $COUNT - 1` + if [ $COUNT = "0" ]; then + LINEEND="" + fi + echo " \$(LOCAL_PATH)/proprietary/$FILE:$FILE$LINEEND" >> $COMMONMAKEFILE +done + + +(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__VENDOR__/$VENDOR/g > ../../../$COMMONOUTDIR/espresso-common-vendor.mk +# Copyright (C) 2015 SlimRoms +# +# 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. + +# Pick up overlay for features that depend on non-open-source files +DEVICE_PACKAGE_OVERLAYS += vendor/__VENDOR__/__COMMON__/overlay + +\$(call inherit-product, vendor/__VENDOR__/__COMMON__/common-vendor-blobs.mk) +EOF + +(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__VENDOR__/$VENDOR/g > ../../../$COMMONOUTDIR/BoardConfigVendor.mk +# Copyright (C) 2015 SlimRoms +# +# 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. + +EOF + diff --git a/proprietary-files.txt b/proprietary-files.txt new file mode 100644 index 0000000..134f074 --- /dev/null +++ b/proprietary-files.txt @@ -0,0 +1,15 @@ +system/bin/gpsd +system/bin/smc.ini +system/bin/smc_pa.ift +system/etc/wifi/bcmdhd_p2p.bin +system/etc/wifi/nvram_mfg.txt +system/etc/wifi/nvram_net.txt +system/lib/hw/gps.omap4.so +system/lib/libQmageDecoder.so +system/lib/libsecnativefeature.so +system/vendor/firmware/BCM4330.hcd +system/vendor/firmware/ducati-m3.bin +system/vendor/lib/drm/libdrmwvmplugin.so +system/vendor/lib/libWVStreamControlAPI_L1.so +system/vendor/lib/libwvdrm_L1.so +system/vendor/lib/libwvm.so diff --git a/proprietary-p31xx-files.txt b/proprietary-p31xx-files.txt index 18b6226..e315d12 100644 --- a/proprietary-p31xx-files.txt +++ b/proprietary-p31xx-files.txt @@ -1,33 +1,3 @@ -system/bin/geomagneticd -system/bin/gpsd -system/bin/orientationd -system/bin/smc.ini -system/bin/smc_pa.ift system/etc/wifi/bcmdhd_apsta.bin system/etc/wifi/bcmdhd_mfg.bin -system/etc/wifi/bcmdhd_p2p.bin system/etc/wifi/bcmdhd_sta.bin -system/etc/wifi/nvram_mfg.txt -system/etc/wifi/nvram_net.txt -system/lib/hw/vendor-camera.piranha.so -system/lib/hw/gps.omap4.so -system/lib/libI420colorconvert.so -system/lib/libOMX.TI.DUCATI1.MISC.SAMPLE.so -system/lib/libOMX.TI.DUCATI1.VIDEO.CAMERA.so -system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.secure.so -system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.so -system/lib/libOMX.TI.DUCATI1.VIDEO.H264E.so -system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so -system/lib/libOMX_Core.so -system/lib/libQmageDecoder.so -system/lib/libdomx.so -system/lib/libion.omap4.so -system/lib/libmm_osal.so -system/lib/libsecnativefeature.so -system/lib/libtiutils.so -system/vendor/firmware/BCM4330.hcd -system/vendor/firmware/ducati-m3.bin -system/vendor/lib/drm/libdrmwvmplugin.so -system/vendor/lib/libWVStreamControlAPI_L1.so -system/vendor/lib/libwvdrm_L1.so -system/vendor/lib/libwvm.so diff --git a/proprietary-p51xx-files.txt b/proprietary-p51xx-files.txt index c3eebbf..2841989 100644 --- a/proprietary-p51xx-files.txt +++ b/proprietary-p51xx-files.txt @@ -1,39 +1,8 @@ system/bin/bintvoutservice -system/bin/geomagneticd -system/bin/gpsd -system/bin/orientationd -system/bin/smc.ini -system/bin/smc_pa.ift system/etc/wifi/bcmdhd_apsta.bin system/etc/wifi/bcmdhd_mfg.bin -system/etc/wifi/bcmdhd_p2p.bin system/etc/wifi/bcmdhd_sta.bin -system/etc/wifi/nvram_mfg.txt -system/etc/wifi/nvram_net.txt -system/lib/hw/vendor-camera.piranha.so -system/lib/hw/gps.omap4.so -system/lib/hw/sensors.omap4.so -system/lib/libdomx.so system/lib/libhdcp.so -system/lib/libI420colorconvert.so -system/lib/libion.omap4.so -system/lib/libmm_osal.so -system/lib/libOMX.TI.DUCATI1.MISC.SAMPLE.so -system/lib/libOMX.TI.DUCATI1.VIDEO.CAMERA.so -system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.secure.so -system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.so -system/lib/libOMX.TI.DUCATI1.VIDEO.H264E.so -system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so -system/lib/libOMX_Core.so -system/lib/libQmageDecoder.so -system/lib/libsecnativefeature.so system/lib/libtvoutinterface.so system/lib/libtvout_jni.so system/lib/libtvoutservice.so -system/lib/libtiutils.so -system/vendor/firmware/BCM4330.hcd -system/vendor/firmware/ducati-m3.bin -system/vendor/lib/drm/libdrmwvmplugin.so -system/vendor/lib/libWVStreamControlAPI_L1.so -system/vendor/lib/libwvdrm_L1.so -system/vendor/lib/libwvm.so -- cgit v1.1