From 15520556bf5ca3260026b9b0ef81ae9a3da08896 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Mon, 21 Nov 2016 12:57:43 +1100 Subject: [PATCH] deb: inherit common blobs from flo Change-Id: I1a677a8a8d07e84015ae4703c07f6ec13a062f39 --- device.mk | 2 +- extract-files.sh | 40 +-------- proprietary-blobs.txt | 194 +----------------------------------------- setup-makefiles.sh | 45 ---------- 4 files changed, 5 insertions(+), 276 deletions(-) delete mode 100755 setup-makefiles.sh diff --git a/device.mk b/device.mk index b72cc41..c1c0434 100644 --- a/device.mk +++ b/device.mk @@ -48,6 +48,6 @@ PRODUCT_PACKAGES += \ $(call inherit-product, device/asus/flo/device-common.mk) # inherit from the non-open-source side, if present -$(call inherit-product-if-exists, vendor/asus/deb/device-vendor.mk) +$(call inherit-product-if-exists, vendor/asus/deb/deb-vendor.mk) DEVICE_PACKAGE_OVERLAYS := device/asus/deb/overlay diff --git a/extract-files.sh b/extract-files.sh index 1fff133..2f5f9b4 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -16,41 +16,7 @@ set -e -VENDOR=asus -DEVICE=deb +export VENDOR=asus +export 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 - if [ $# -eq 1 ]; then - SRC=$1 - else - echo "$0: bad number of arguments" - echo "" - echo "usage: $0 [PATH_TO_EXPANDED_ROM]" - echo "" - echo "If PATH_TO_EXPANDED_ROM is not specified, blobs will be extracted from" - echo "the device using adb pull." - exit 1 - fi -fi - -# Initialize the helper -setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" - -extract "$MY_DIR"/proprietary-blobs.txt "$SRC" - -"$MY_DIR"/setup-makefiles.sh +./../flo/extract-files.sh $@ diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 17bfc37..92fd075 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -12,198 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT - -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/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 deleted file mode 100755 index 783bcb4..0000000 --- a/setup-makefiles.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/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" - -# Initialize the helper -setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" - -# Copyright headers and guards -write_headers - -# The standard blobs -write_makefiles "$MY_DIR"/proprietary-blobs.txt - -# Done -write_footers