diff options
| author | razorloves <razorloves@gmail.com> | 2016-08-14 03:44:43 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-08-14 02:54:15 -0700 |
| commit | aab730d946b192e86471cb3b3e820ddeca50196a (patch) | |
| tree | cf89569ee56485f388c5f5f1933ddbe4f63feb69 | |
| parent | a74ee15a53e328031e6be4a2e474a77712902486 (diff) | |
deb: switch to new generic-extract utils
Change-Id: I7e2b61b4237465feb8dd188528b148642c99eb63
| -rwxr-xr-x | extract-files.sh | 48 | ||||
| -rw-r--r-- | proprietary-blobs.txt | 388 | ||||
| -rwxr-xr-x | setup-makefiles.sh | 96 |
3 files changed, 251 insertions, 281 deletions
diff --git a/extract-files.sh b/extract-files.sh index 8de30b7..1fff133 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,10 +1,37 @@ -#!/bin/sh +#!/bin/bash +# +# Copyright (C) 2016 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. set -e VENDOR=asus DEVICE=deb +# Load extractutils and do some sanity checks +MY_DIR="${BASH_SOURCE%/*}" +if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi + +CM_ROOT="$MY_DIR"/../../.. + +HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh +if [ ! -f "$HELPER" ]; then + echo "Unable to find helper script at $HELPER" + exit 1 +fi +. "$HELPER" + if [ $# -eq 0 ]; then SRC=adb else @@ -21,20 +48,9 @@ else fi fi -BASE=../../../vendor/$VENDOR/$DEVICE/proprietary -rm -rf $BASE/* - -for FILE in `cat proprietary-blobs.txt | grep -v ^# | grep -v ^$ | sed -e 's#^/system/##g'`; do - DIR=`dirname $FILE` - if [ ! -d $BASE/$DIR ]; then - mkdir -p $BASE/$DIR - fi - if [ "$SRC" = "adb" ]; then - adb pull /system/$FILE $BASE/$FILE - else - cp $SRC/system/$FILE $BASE/$FILE - fi +# Initialize the helper +setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" -done +extract "$MY_DIR"/proprietary-blobs.txt "$SRC" -./setup-makefiles.sh +"$MY_DIR"/setup-makefiles.sh diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 125bd4b..bed1919 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -14,197 +14,197 @@ # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT -/system/bin/ATFWD-daemon -/system/bin/bridgemgrd -/system/bin/btnvtool -/system/bin/diag_klog -/system/bin/diag_mdlog -/system/bin/ds_fmc_appd -/system/bin/efsks -/system/bin/hci_qcomm_init -/system/bin/irsc_util -/system/bin/ks -/system/bin/mm-qcamera-app -/system/bin/mm-qcamera-daemon -/system/bin/mm-qjpeg-enc-test -/system/bin/mm-qomx-ienc-test -/system/bin/mpdecision -/system/bin/netmgrd -/system/bin/nl_listener -/system/bin/port-bridge -/system/bin/qcks -/system/bin/qmuxd -/system/bin/qseecomd -/system/bin/radish -/system/bin/rmt_storage -/system/bin/sensors.qcom -/system/bin/thermald -/system/bin/usbhub -/system/bin/usbhub_init -/system/etc/DxHDCP.cfg -/system/etc/firmware/vidc.b00 -/system/etc/firmware/vidc.b01 -/system/etc/firmware/vidc.b02 -/system/etc/firmware/vidc.b03 -/system/etc/firmware/vidc.mdt -/system/etc/firmware/vidcfw.elf -/system/etc/firmware/vidc_1080p.fw -/system/etc/gps.conf -/system/vendor/lib/egl/eglsubAndroid.so -/system/vendor/lib/egl/libEGL_adreno.so -/system/vendor/lib/egl/libGLESv1_CM_adreno.so -/system/vendor/lib/egl/libGLESv2_adreno.so -/system/vendor/lib/egl/libplayback_adreno.so -/system/vendor/lib/egl/libq3dtools_adreno.so -/system/lib/hw/flp.msm8960.so -/system/lib/hw/gps.msm8960.so -/system/lib/hw/sensors.msm8960.so -/system/lib/libacdbdata.so -/system/lib/libacdbloader.so -/system/vendor/lib/libadreno_utils.so -/system/lib/libAKM.so -/system/lib/libaudcal.so -/system/lib/libaudioalsa.so -/system/vendor/lib/libC2D2.so -/system/vendor/lib/libc2d30-a3xx.so -/system/vendor/lib/libc2d30.so -/system/vendor/lib/libCB.so -/system/lib/libchromatix_ov5693_common.so -/system/lib/libchromatix_ov5693_default_video.so -/system/lib/libchromatix_ov5693_preview.so -/system/lib/libCommandSvc.so -/system/lib/libconfigdb.so -/system/lib/libcsd-client.so -/system/lib/libdiag.so -/system/lib/libdrmdiag.so -/system/lib/libdrmfs.so -/system/lib/libdrmtime.so -/system/lib/libdsi_netctrl.so -/system/lib/libdsprofile.so -/system/lib/libdss.so -/system/lib/libdsucsd.so -/system/lib/libdsutils.so -/system/lib/libDxHdcp.so -/system/lib/libgps.utils.so -/system/vendor/lib/libgsl.so -/system/lib/libI420colorconvert.so -/system/lib/libidl.so -/system/vendor/lib/libllvm-qcom.so -/system/vendor/lib/libbccQTI.so -/system/lib/libloc_core.so -/system/lib/libloc_eng.so -/system/lib/libmm-abl.so -/system/lib/libmm-color-convertor.so -/system/lib/libmmcamera2_stats_algorithm.so -/system/lib/libmmcamera_image_stab.so -/system/lib/libmmcamera_mi1040.so -/system/lib/libmmcamera_ov5693.so -/system/lib/libnetmgr.so -/system/lib/liboemcrypto.so -/system/lib/libqcci_legacy.so -/system/lib/libqdi.so -/system/lib/libqdp.so -/system/lib/libqmi.so -/system/lib/libqmiservices.so -/system/lib/libqmi_cci.so -/system/lib/libqmi_client_qmux.so -/system/lib/libqmi_common_so.so -/system/lib/libqmi_csi.so -/system/lib/libqmi_csvt_srvc.so -/system/lib/libqmi_encdec.so -/system/lib/libQSEEComAPI.so -/system/lib/libril-qc-qmi-1.so -/system/lib/libril-qcril-hook-oem.so -/system/vendor/lib/libRSDriver_adreno.so -/system/vendor/lib/librs_adreno.so -/system/vendor/lib/librs_adreno_sha1.so -/system/vendor/lib/libsc-a3xx.so -/system/lib/libsensor1.so -/system/lib/libsensor_reg.so -/system/lib/libsensor_user_cal.so -/system/lib/libstagefright_hdcp.so -/system/vendor/lib/libWVphoneAPI.so -/system/lib/libxml.so -/system/vendor/firmware/a300_pfp.fw -/system/vendor/firmware/a300_pm4.fw -/system/vendor/firmware/bcm2079x-b5_firmware.ncd -/system/vendor/firmware/bcm2079x-b5_pre_firmware.ncd -/system/vendor/firmware/discretix/dxhdcp2.b00 -/system/vendor/firmware/discretix/dxhdcp2.b01 -/system/vendor/firmware/discretix/dxhdcp2.b02 -/system/vendor/firmware/discretix/dxhdcp2.b03 -/system/vendor/firmware/discretix/dxhdcp2.mdt -/system/vendor/firmware/dsps.b00 -/system/vendor/firmware/dsps.b01 -/system/vendor/firmware/dsps.b02 -/system/vendor/firmware/dsps.b03 -/system/vendor/firmware/dsps.b04 -/system/vendor/firmware/dsps.b05 -/system/vendor/firmware/dsps.mdt -/system/vendor/firmware/gss.b00 -/system/vendor/firmware/gss.b01 -/system/vendor/firmware/gss.b02 -/system/vendor/firmware/gss.b03 -/system/vendor/firmware/gss.b04 -/system/vendor/firmware/gss.b05 -/system/vendor/firmware/gss.b06 -/system/vendor/firmware/gss.b07 -/system/vendor/firmware/gss.b08 -/system/vendor/firmware/gss.b09 -/system/vendor/firmware/gss.b10 -/system/vendor/firmware/gss.b11 -/system/vendor/firmware/gss.mdt -/system/vendor/firmware/keymaster/keymaster.b00 -/system/vendor/firmware/keymaster/keymaster.b01 -/system/vendor/firmware/keymaster/keymaster.b02 -/system/vendor/firmware/keymaster/keymaster.b03 -/system/vendor/firmware/keymaster/keymaster.mdt -/system/vendor/firmware/q6.b00 -/system/vendor/firmware/q6.b01 -/system/vendor/firmware/q6.b03 -/system/vendor/firmware/q6.b04 -/system/vendor/firmware/q6.b05 -/system/vendor/firmware/q6.b06 -/system/vendor/firmware/q6.mdt -/system/vendor/firmware/tzapps.b00 -/system/vendor/firmware/tzapps.b01 -/system/vendor/firmware/tzapps.b02 -/system/vendor/firmware/tzapps.b03 -/system/vendor/firmware/tzapps.mdt -/system/vendor/firmware/wcnss.b00 -/system/vendor/firmware/wcnss.b01 -/system/vendor/firmware/wcnss.b02 -/system/vendor/firmware/wcnss.b04 -/system/vendor/firmware/wcnss.b05 -/system/vendor/firmware/wcnss.mdt -/system/vendor/lib/drm/libdrmwvmplugin.so -/system/vendor/lib/libdrmdecrypt.so -/system/vendor/lib/libgemini.so -/system/vendor/lib/libgeofence.so -/system/vendor/lib/libimage-jpeg-enc-omx-comp.so -/system/vendor/lib/libimage-omx-common.so -/system/vendor/lib/libizat_core.so -/system/vendor/lib/libloc_api_v02.so -/system/vendor/lib/libloc_ds_api.so -/system/vendor/lib/libmmcamera2_c2d_module.so -/system/vendor/lib/libmmcamera2_cpp_module.so -/system/vendor/lib/libmmcamera2_iface_modules.so -/system/vendor/lib/libmmcamera2_imglib_modules.so -/system/vendor/lib/libmmcamera2_isp_modules.so -/system/vendor/lib/libmmcamera2_pproc_modules.so -/system/vendor/lib/libmmcamera2_sensor_modules.so -/system/vendor/lib/libmmcamera2_stats_modules.so -/system/vendor/lib/libmmcamera2_vpe_module.so -/system/vendor/lib/libmmcamera2_wnr_module.so -/system/vendor/lib/libmmcamera_faceproc.so -/system/vendor/lib/libmmcamera_imglib.so -/system/vendor/lib/libmmipl.so -/system/vendor/lib/libmmjpeg.so -/system/vendor/lib/libmmqjpeg_codec.so -/system/vendor/lib/libmmstillomx.so -/system/vendor/lib/liboemcamera.so -/system/vendor/lib/libqomx_jpegenc.so -/system/vendor/lib/libwvdrm_L1.so -/system/vendor/lib/libwvm.so -/system/vendor/lib/libWVStreamControlAPI_L1.so -/system/vendor/lib/mediadrm/libwvdrmengine.so +bin/ATFWD-daemon +bin/bridgemgrd +bin/btnvtool +bin/diag_klog +bin/diag_mdlog +bin/ds_fmc_appd +bin/efsks +bin/hci_qcomm_init +bin/irsc_util +bin/ks +bin/mm-qcamera-app +bin/mm-qcamera-daemon +bin/mm-qjpeg-enc-test +bin/mm-qomx-ienc-test +bin/mpdecision +bin/netmgrd +bin/nl_listener +bin/port-bridge +bin/qcks +bin/qmuxd +bin/qseecomd +bin/radish +bin/rmt_storage +bin/sensors.qcom +bin/thermald +bin/usbhub +bin/usbhub_init +etc/DxHDCP.cfg +etc/firmware/vidc.b00 +etc/firmware/vidc.b01 +etc/firmware/vidc.b02 +etc/firmware/vidc.b03 +etc/firmware/vidc.mdt +etc/firmware/vidcfw.elf +etc/firmware/vidc_1080p.fw +etc/gps.conf +vendor/lib/egl/eglsubAndroid.so +vendor/lib/egl/libEGL_adreno.so +vendor/lib/egl/libGLESv1_CM_adreno.so +vendor/lib/egl/libGLESv2_adreno.so +vendor/lib/egl/libplayback_adreno.so +vendor/lib/egl/libq3dtools_adreno.so +lib/hw/flp.msm8960.so +lib/hw/gps.msm8960.so +lib/hw/sensors.msm8960.so +lib/libacdbdata.so +lib/libacdbloader.so +vendor/lib/libadreno_utils.so +lib/libAKM.so +lib/libaudcal.so +lib/libaudioalsa.so +vendor/lib/libC2D2.so +vendor/lib/libc2d30-a3xx.so +vendor/lib/libc2d30.so +vendor/lib/libCB.so +lib/libchromatix_ov5693_common.so +lib/libchromatix_ov5693_default_video.so +lib/libchromatix_ov5693_preview.so +lib/libCommandSvc.so +lib/libconfigdb.so +lib/libcsd-client.so +lib/libdiag.so +lib/libdrmdiag.so +lib/libdrmfs.so +lib/libdrmtime.so +lib/libdsi_netctrl.so +lib/libdsprofile.so +lib/libdss.so +lib/libdsucsd.so +lib/libdsutils.so +lib/libDxHdcp.so +lib/libgps.utils.so +vendor/lib/libgsl.so +lib/libI420colorconvert.so +lib/libidl.so +vendor/lib/libllvm-qcom.so +vendor/lib/libbccQTI.so +lib/libloc_core.so +lib/libloc_eng.so +lib/libmm-abl.so +lib/libmm-color-convertor.so +lib/libmmcamera2_stats_algorithm.so +lib/libmmcamera_image_stab.so +lib/libmmcamera_mi1040.so +lib/libmmcamera_ov5693.so +lib/libnetmgr.so +lib/liboemcrypto.so +lib/libqcci_legacy.so +lib/libqdi.so +lib/libqdp.so +lib/libqmi.so +lib/libqmiservices.so +lib/libqmi_cci.so +lib/libqmi_client_qmux.so +lib/libqmi_common_so.so +lib/libqmi_csi.so +lib/libqmi_csvt_srvc.so +lib/libqmi_encdec.so +lib/libQSEEComAPI.so +lib/libril-qc-qmi-1.so +lib/libril-qcril-hook-oem.so +vendor/lib/libRSDriver_adreno.so +vendor/lib/librs_adreno.so +vendor/lib/librs_adreno_sha1.so +vendor/lib/libsc-a3xx.so +lib/libsensor1.so +lib/libsensor_reg.so +lib/libsensor_user_cal.so +lib/libstagefright_hdcp.so +vendor/lib/libWVphoneAPI.so +lib/libxml.so +vendor/firmware/a300_pfp.fw +vendor/firmware/a300_pm4.fw +vendor/firmware/bcm2079x-b5_firmware.ncd +vendor/firmware/bcm2079x-b5_pre_firmware.ncd +vendor/firmware/discretix/dxhdcp2.b00 +vendor/firmware/discretix/dxhdcp2.b01 +vendor/firmware/discretix/dxhdcp2.b02 +vendor/firmware/discretix/dxhdcp2.b03 +vendor/firmware/discretix/dxhdcp2.mdt +vendor/firmware/dsps.b00 +vendor/firmware/dsps.b01 +vendor/firmware/dsps.b02 +vendor/firmware/dsps.b03 +vendor/firmware/dsps.b04 +vendor/firmware/dsps.b05 +vendor/firmware/dsps.mdt +vendor/firmware/gss.b00 +vendor/firmware/gss.b01 +vendor/firmware/gss.b02 +vendor/firmware/gss.b03 +vendor/firmware/gss.b04 +vendor/firmware/gss.b05 +vendor/firmware/gss.b06 +vendor/firmware/gss.b07 +vendor/firmware/gss.b08 +vendor/firmware/gss.b09 +vendor/firmware/gss.b10 +vendor/firmware/gss.b11 +vendor/firmware/gss.mdt +vendor/firmware/keymaster/keymaster.b00 +vendor/firmware/keymaster/keymaster.b01 +vendor/firmware/keymaster/keymaster.b02 +vendor/firmware/keymaster/keymaster.b03 +vendor/firmware/keymaster/keymaster.mdt +vendor/firmware/q6.b00 +vendor/firmware/q6.b01 +vendor/firmware/q6.b03 +vendor/firmware/q6.b04 +vendor/firmware/q6.b05 +vendor/firmware/q6.b06 +vendor/firmware/q6.mdt +vendor/firmware/tzapps.b00 +vendor/firmware/tzapps.b01 +vendor/firmware/tzapps.b02 +vendor/firmware/tzapps.b03 +vendor/firmware/tzapps.mdt +vendor/firmware/wcnss.b00 +vendor/firmware/wcnss.b01 +vendor/firmware/wcnss.b02 +vendor/firmware/wcnss.b04 +vendor/firmware/wcnss.b05 +vendor/firmware/wcnss.mdt +vendor/lib/drm/libdrmwvmplugin.so +vendor/lib/libdrmdecrypt.so +vendor/lib/libgemini.so +vendor/lib/libgeofence.so +vendor/lib/libimage-jpeg-enc-omx-comp.so +vendor/lib/libimage-omx-common.so +vendor/lib/libizat_core.so +vendor/lib/libloc_api_v02.so +vendor/lib/libloc_ds_api.so +vendor/lib/libmmcamera2_c2d_module.so +vendor/lib/libmmcamera2_cpp_module.so +vendor/lib/libmmcamera2_iface_modules.so +vendor/lib/libmmcamera2_imglib_modules.so +vendor/lib/libmmcamera2_isp_modules.so +vendor/lib/libmmcamera2_pproc_modules.so +vendor/lib/libmmcamera2_sensor_modules.so +vendor/lib/libmmcamera2_stats_modules.so +vendor/lib/libmmcamera2_vpe_module.so +vendor/lib/libmmcamera2_wnr_module.so +vendor/lib/libmmcamera_faceproc.so +vendor/lib/libmmcamera_imglib.so +vendor/lib/libmmipl.so +vendor/lib/libmmjpeg.so +vendor/lib/libmmqjpeg_codec.so +vendor/lib/libmmstillomx.so +vendor/lib/liboemcamera.so +vendor/lib/libqomx_jpegenc.so +vendor/lib/libwvdrm_L1.so +vendor/lib/libwvm.so +vendor/lib/libWVStreamControlAPI_L1.so +vendor/lib/mediadrm/libwvdrmengine.so diff --git a/setup-makefiles.sh b/setup-makefiles.sh index f3f20a7..783bcb4 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,48 +1,12 @@ -#!/bin/sh - -VENDOR=asus -DEVICE=deb -OUTDIR=vendor/$VENDOR/$DEVICE -MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk - -(cat << EOF) > $MAKEFILE -# Copyright (C) 2014 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 +#!/bin/bash # -# 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 - -PRODUCT_COPY_FILES += \\ -EOF - -LINEEND=" \\" -COUNT=`cat proprietary-blobs.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}` -for FILE in `cat proprietary-blobs.txt | grep -v ^# | grep -v ^$ | sed -e 's#^/system/##g'`; 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) 2014 The CyanogenMod Project +# Copyright (C) 2016 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 +# 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, @@ -50,42 +14,32 @@ done # 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 +set -e -# Live wallpaper packages -PRODUCT_PACKAGES := \\ - LiveWallpapers \\ - LiveWallpapersPicker \\ - MagicSmokeWallpapers \\ - VisualizationWallpapers \\ - librs_jni +VENDOR=asus +DEVICE=deb -# Publish that we support the live wallpaper feature. -PRODUCT_COPY_FILES := \\ - packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml +# Load extractutils and do some sanity checks +MY_DIR="${BASH_SOURCE%/*}" +if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi -# Pick up overlay for features that depend on non-open-source files -DEVICE_PACKAGE_OVERLAYS := vendor/$VENDOR/$DEVICE/overlay +CM_ROOT="$MY_DIR"/../../.. -\$(call inherit-product, vendor/$VENDOR/$DEVICE/$DEVICE-vendor-blobs.mk) -EOF +HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh +if [ ! -f "$HELPER" ]; then + echo "Unable to find helper script at $HELPER" + exit 1 +fi +. "$HELPER" -(cat << EOF) > ../../../$OUTDIR/BoardConfigVendor.mk -# Copyright (C) 2014 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. +# Initialize the helper +setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" + +# Copyright headers and guards +write_headers -# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh +# The standard blobs +write_makefiles "$MY_DIR"/proprietary-blobs.txt -USE_CAMERA_STUB := false -EOF +# Done +write_footers |
