Permalink
Browse files

p930: Use new list-based prop extractor

Change-Id: I382a18beb0a0f8337eddd8f0a770820ff5fc2426
  • Loading branch information...
1 parent bbd3ad3 commit 829766facdb2dbdb866067a4a802f70f85a4d8c0 @rmcc rmcc committed May 15, 2012
Showing with 119 additions and 132 deletions.
  1. +17 −0 extract-files.sh
  2. +69 −0 proprietary-files.txt
  3. +33 −132 setup-makefiles.sh
View
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+VENDOR=lge
+DEVICE=p930
+
+BASE=../../../vendor/$VENDOR/$DEVICE/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
+ adb pull /system/$FILE $BASE/$FILE
+done
+
+./setup-makefiles.sh
View
@@ -0,0 +1,69 @@
+# http
+lib/hw/sensors.msm8660.so
+etc/firmware/vidc_1080p.fw
+etc/firmware/BCM4330B1_002.001.003.0243.0308.hcd
+lib/egl/libq3dtools_adreno200.so
+lib/egl/libGLESv2_adreno200.so
+lib/egl/libGLESv1_CM_adreno200.so
+lib/egl/libEGL_adreno200.so
+lib/egl/eglsubAndroid.so
+etc/firmware/yamato_pfp.fw
+etc/firmware/yamato_pm4.fw
+etc/firmware/leia_pfp_470.fw
+etc/firmware/leia_pm4_470.fw
+lib/libC2D2.so
+lib/libOpenVG.so
+lib/libgsl.so
+lib/libsc-a2xx.so
+bin/rmt_storage
+bin/qmuxd
+bin/qmiproxy
+bin/netmgrd
+bin/qrngd
+bin/rild
+bin/qcks
+bin/ks
+bin/time_daemon
+lib/libril-qc-qmi-1.so
+lib/libril-qcril-hook-oem.so
+lib/libqmi.so
+lib/libril.so
+lib/libqmi.so
+lib/libdiag.so
+lib/libdsutils.so
+lib/libqmiservices.so
+lib/libidl.so
+lib/libdsi_netctrl.so
+lib/libqdp.so
+lib/libnetmgr.so
+lib/libtime_genoff.so
+lib/liboncrpc.so
+lib/libnv.so
+lib/libdsm.so
+lib/libqueue.so
+lib/libtime_remote_atom.so
+bin/thermald
+bin/mpdecision
+lib/libthermal_mitigation_fusion.so
+lib/libthermal_mitigation.so
+etc/wl/rtecdc.bin
+etc/wl/rtecdc-apsta.bin
+lib/libaudioalsa.so
+lib/libaudio.so
+lib/libaudcal.so
+lib/libacdbmapper.so
+lib/libacdbloader.so
+lib/liba2dp.so
+lib/libmmjps.so
+lib/libmmjpeg.so
+lib/libmmipl.so
+lib/liboemcamera.so
+lib/libmmmpod.so
+lib/libmmmpo.so
+lib/libmmstereo.so
+lib/lib_LG_fastaf_v2.0.so
+lib/libgemini.so
+lib/libchromatix_imx105_preview.so
+lib/hw/camera.msm8660.so
+bin/ami304d
+lib/libv8.so
View
@@ -1,5 +1,11 @@
#!/bin/sh
+VENDOR=lge
+DEVICE=p930
+OUTDIR=vendor/$VENDOR/$DEVICE
+MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk
+
+(cat << EOF) > $MAKEFILE
# Copyright (C) 2012 The CyanogenMod Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +20,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-VENDOR=lge
-DEVICE=p930
+# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
+
+# Prebuilt libraries that are needed to build open-source libraries
+PRODUCT_COPY_FILES := \\
+ $OUTDIR/proprietary/lib/liboncrpc.so:obj/lib/liboncrpc.so \\
+ $OUTDIR/proprietary/lib/libnv.so:obj/lib/libnv.so \\
+ $OUTDIR/proprietary/lib/libaudio.so:obj/lib/libaudio.so \\
+ $OUTDIR/proprietary/lib/libv8.so:obj/lib/libv8.so
-mkdir -p ../../../vendor/$VENDOR/$DEVICE
+PRODUCT_COPY_FILES += \\
+EOF
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../vendor/$VENDOR/$DEVICE/$DEVICE-vendor.mk
+LINEEND=" \\"
+COUNT=`cat proprietary-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}`
+for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do
+ COUNT=`expr $COUNT - 1`
+ if [ $COUNT = "0" ]; then
+ LINEEND=""
+ fi
+ echo " $OUTDIR/proprietary/$FILE:system/$FILE$LINEEND" >> $MAKEFILE
+done
+
+(cat << EOF) > ../../../$OUTDIR/$DEVICE-vendor.mk
# Copyright (C) 2012 The CyanogenMod Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,7 +57,7 @@ mkdir -p ../../../vendor/$VENDOR/$DEVICE
# See the License for the specific language governing permissions and
# limitations under the License.
-# This file is generated by device/__VENDOR__/__DEVICE__/setup-makefiles.sh
+# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
# Live wallpaper packages
PRODUCT_PACKAGES := \\
@@ -48,134 +71,13 @@ PRODUCT_PACKAGES := \\
PRODUCT_COPY_FILES := \\
packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
-\$(call inherit-product, vendor/__VENDOR__/__DEVICE__/__DEVICE__-vendor-blobs.mk)
-EOF
-
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../vendor/$VENDOR/$DEVICE/$DEVICE-vendor-blobs.mk
-# Copyright (C) 2012 The CyanogenMod 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/__VENDOR__/__DEVICE__/setup-makefiles.sh
-
-# HAL
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/hw/sensors.msm8660.so:system/lib/hw/sensors.msm8660.so
-
-# OMX FW
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/firmware/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw
-
-# BT FW
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/firmware/BCM4330B1_002.001.003.0243.0308.hcd:system/etc/firmware/BCM4330B1_002.001.003.0243.0308.hcd
-
-# EGL
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/egl/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/egl/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/egl/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/egl/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/egl/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/firmware/yamato_pfp.fw:system/etc/firmware/yamato_pfp.fw \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/firmware/yamato_pm4.fw:system/etc/firmware/yamato_pm4.fw \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/firmware/leia_pfp_470.fw:system/etc/firmware/leia_pfp_470.fw \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/firmware/leia_pm4_470.fw:system/etc/firmware/leia_pm4_470.fw \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libC2D2.so:system/lib/libC2D2.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libOpenVG.so:system/lib/libOpenVG.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libgsl.so:system/lib/libgsl.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libsc-a2xx.so:system/lib/libsc-a2xx.so
-
-# RIL, modem, Q6
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/rmt_storage:system/bin/rmt_storage \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/qmuxd:system/bin/qmuxd \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/qmiproxy:system/bin/qmiproxy \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/netmgrd:system/bin/netmgrd \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/qrngd:system/bin/qrngd \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/rild:system/bin/rild \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/qcks:system/bin/qcks \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/ks:system/bin/ks \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/time_daemon:system/bin/time_daemon \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libril-qc-qmi-1.so:system/lib/libril-qc-qmi-1.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libril-qcril-hook-oem.so:system/lib/libril-qcril-hook-oem.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libqmi.so:system/lib/libqmi.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libril.so:system/lib/libril.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libqmi.so:system/lib/libqmi.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libdiag.so:system/lib/libdiag.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libdsutils.so:system/lib/libdsutils.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libqmiservices.so:system/lib/libqmiservices.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libidl.so:system/lib/libidl.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libdsi_netctrl.so:system/lib/libdsi_netctrl.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libqdp.so:system/lib/libqdp.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libnetmgr.so:system/lib/libnetmgr.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libtime_genoff.so:system/lib/libtime_genoff.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/liboncrpc.so:system/lib/liboncrpc.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/liboncrpc.so:obj/lib/liboncrpc.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libnv.so:system/lib/libnv.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libnv.so:obj/lib/libnv.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libdsm.so:system/lib/libdsm.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libqueue.so:system/lib/libqueue.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libtime_remote_atom.so:system/lib/libtime_remote_atom.so
-
-# CPU management
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/thermald:system/bin/thermald \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/mpdecision:system/bin/mpdecision \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libthermal_mitigation_fusion.so:system/lib/libthermal_mitigation_fusion.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libthermal_mitigation.so:system/lib/libthermal_mitigation.so
-
-## WiFi
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/wl/rtecdc.bin:system/etc/wl/rtecdc.bin \\
- vendor/__VENDOR__/__DEVICE__/proprietary/etc/wl/rtecdc-apsta.bin:system/etc/wl/rtecdc-apsta.bin
-
-## Audio
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libaudioalsa.so:system/lib/libaudioalsa.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libaudio.so:system/lib/libaudio.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libaudio.so:obj/lib/libaudio.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libaudcal.so:system/lib/libaudcal.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libacdbmapper.so:system/lib/libacdbmapper.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libacdbloader.so:system/lib/libacdbloader.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/liba2dp.so:system/lib/liba2dp.so
-
-## Camera
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libmmjps.so:system/lib/libmmjps.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libmmjpeg.so:system/lib/libmmjpeg.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libmmipl.so:system/lib/libmmipl.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/liboemcamera.so:system/lib/liboemcamera.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libmmmpod.so:system/lib/libmmmpod.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libmmmpo.so:system/lib/libmmmpo.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libmmstereo.so:system/lib/libmmstereo.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/lib_LG_fastaf_v2.0.so:system/lib/lib_LG_fastaf_v2.0.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libgemini.so:system/lib/libgemini.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libchromatix_imx105_preview.so:system/lib/libchromatix_imx105_preview.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/hw/camera.msm8660.so:system/lib/hw/camera.msm8660.so
-
-## Sensors daemon
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/bin/ami304d:system/bin/ami304d
-
-## QCOM prop webkit improvements
-PRODUCT_COPY_FILES += \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libv8.so:obj/lib/libv8.so \\
- vendor/__VENDOR__/__DEVICE__/proprietary/lib/libv8.so:system/lib/libv8.so
+# Pick up overlay for features that depend on non-open-source files
+DEVICE_PACKAGE_OVERLAYS := vendor/$VENDOR/$DEVICE/overlay
+\$(call inherit-product, vendor/$VENDOR/$DEVICE/$DEVICE-vendor-blobs.mk)
EOF
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../vendor/$VENDOR/$DEVICE/BoardConfigVendor.mk
+(cat << EOF) > ../../../$OUTDIR/BoardConfigVendor.mk
# Copyright (C) 2012 The CyanogenMod Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -190,8 +92,7 @@ EOF
# See the License for the specific language governing permissions and
# limitations under the License.
-# This file is generated by device/__VENDOR__/__DEVICE__/setup-makefiles.sh
+# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
USE_CAMERA_STUB := false
EOF
-

0 comments on commit 829766f

Please sign in to comment.