condor: use common vendor blobs

Change-Id: Ic7fa50775fe1a671e6b6bb1ddb1d16b0299b687e

7 files changed, 4 insertions, 150 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 57bf07b..9d35d98 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
--include vendor/motorola/condor/BoardConfigVendor.mk
-
 # inherit from common msm8610-common
 -include device/motorola/msm8610-common/BoardConfigCommon.mk
 
diff --git a/device.mk b/device.mk
index d1d0657..8751b03 100644
--- a/device.mk
+++ b/device.mk
@@ -21,6 +21,9 @@
 
 LOCAL_PATH := device/motorola/condor
 
+# device specific vendor blobs
+$(call inherit-product-if-exists, vendor/motorola/condor/condor-vendor.mk)
+
 # Ramdisk
  PRODUCT_COPY_FILES += \
      $(call find-copy-subdir-files,*,${LOCAL_PATH}/ramdisk,root)
diff --git a/extract-files.sh b/extract-files.sh
index 14b9dbb..ffc8333 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -53,7 +53,6 @@ function extract() {
 DEVBASE=../../../vendor/$VENDOR/$DEVICE/proprietary
 rm -rf $DEVBASE/*
 
-extract proprietary-files-qc.txt $DEVBASE
 extract proprietary-files.txt $DEVBASE
 
-../../../device/$VENDOR/$DEVICE/setup-makefiles.sh
\ No newline at end of file
+../../../device/$VENDOR/$DEVICE/setup-makefiles.sh
diff --git a/full_condor.mk b/full_condor.mk
index c7076b0..6603997 100644
--- a/full_condor.mk
+++ b/full_condor.mk
@@ -28,5 +28,3 @@ PRODUCT_DEVICE := condor
 PRODUCT_BRAND := motorola
 PRODUCT_MODEL := condor
 PRODUCT_MANUFACTURER := motorola
-
-$(call inherit-product-if-exists, vendor/motorola/condor/condor-vendor.mk)
diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
deleted file mode 100644
index a7ee4b5..0000000
--- a/proprietary-files-qc.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-#Blobs from victara go here
-bin/adsprpcd
-bin/ATFWD-daemon
-bin/batt_health
-bin/btnvtool
-bin/hardware_revisions.sh
-bin/hci_qcomm_init
-bin/irsc_util
-bin/location-mq
-bin/mm-qcamera-daemon
-bin/mpdecision
-bin/netmgrd
-bin/qmi_motext_hook
-bin/qmuxd
-bin/qseecomd
-bin/rfs_access
-bin/rild
-bin/rmt_storage
-bin/time_daemon
-bin/xtwifi-client
-bin/xtwifi-inet-agent
-lib/libactions_irservice_stm.so
-lib/libadropbox.so
-lib/libdmengine.so
-lib/libdrmdecrypt.so
-lib/libGLESv3.so
-lib/libloc_api_v02.so
-lib/libloc_ds_api.so
-lib/libmdmcutback.so
-lib/libmdmdetect.so
-lib/libmmjpeg_interface.so
-lib/libmotext_inf.so
-lib/libmotocalibration.so
-lib/libmoto_netutil.so
-lib/libmot_sensorlistener.so
-lib/libOmxVdecHevc.so
-lib/libpkip.so
-lib/libqmimotext.so
-lib/libqomx_core.so
-lib/libril.so
-lib/libtpa_core.so
-lib/libtpa.so
-vendor/lib/drm/libdrmwvmplugin.so
-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/libq3dtools_adreno.so
-vendor/lib/libadreno_utils.so
-vendor/lib/libadsprpc.so
-vendor/lib/libbccQTI.so
-vendor/lib/libbtnv.so
-vendor/lib/libC2D2.so
-vendor/lib/libc2d30-a3xx.so
-vendor/lib/libc2d30-a4xx.so
-vendor/lib/libCB.so
-vendor/lib/libcneapiclient.so
-vendor/lib/libcneconn.so
-vendor/lib/libcneqmiutils.so
-vendor/lib/libcneutils.so
-vendor/lib/libconfigdb.so
-vendor/lib/libdiag.so
-vendor/lib/libdrmdiag.so
-vendor/lib/libdrmfs.so
-vendor/lib/libdrmtime.so
-vendor/lib/libdsi_netctrl.so
-vendor/lib/libdsutils.so
-vendor/lib/libfastcvopt.so
-vendor/lib/libgeofence.so
-vendor/lib/libgsl.so
-vendor/lib/libI420colorconvert.so
-vendor/lib/libidl.so
-vendor/lib/libizat_core.so
-vendor/lib/libjpegdhw.so
-vendor/lib/libjpegehw.so
-vendor/lib/liblbs_core.so
-vendor/lib/libllvm-qcom.so
-vendor/lib/liblocationservice.so
-vendor/lib/libloc_ext.so
-vendor/lib/liblowi_client.so
-vendor/lib/libmm-hdcpmgr.so
-vendor/lib/libmmipl.so
-vendor/lib/libmmjpeg.so
-vendor/lib/libmmqjpeg_codec.so
-vendor/lib/libmmQSM.so
-vendor/lib/libmmrtpdecoder.so
-vendor/lib/libnetmgr.so
-vendor/lib/liboemcamera.so
-vendor/lib/liboemcrypto.so
-vendor/lib/libOmxAacDec.so
-vendor/lib/libOmxAmrwbplusDec.so
-vendor/lib/libOmxEvrcDec.so
-vendor/lib/libOmxQcelp13Dec.so
-vendor/lib/libOmxWmaDec.so
-vendor/lib/libOpenCL.so
-vendor/lib/libprdrmdecrypt.so
-vendor/lib/libqcci_legacy.so
-vendor/lib/libqdi.so
-vendor/lib/libqdp.so
-vendor/lib/libqmi_cci.so
-vendor/lib/libqmi_client_qmux.so
-vendor/lib/libqmi_common_so.so
-vendor/lib/libqmi_csi.so
-vendor/lib/libqmi_csvt_srvc.so
-vendor/lib/libqmi_encdec.so
-vendor/lib/libqmiservices.so
-vendor/lib/libqmi.so
-vendor/lib/libqomx_jpegdec.so
-vendor/lib/libqomx_jpegenc.so
-vendor/lib/libQSEEComAPI.so
-vendor/lib/libquipc_os_api.so
-vendor/lib/libquipc_ulp_adapter.so
-vendor/lib/libril-qc-qmi-1.so
-vendor/lib/libril-qcril-hook-oem.so
-vendor/lib/librpmb.so
-vendor/lib/librs_adreno_sha1.so
-vendor/lib/librs_adreno.so
-vendor/lib/libRSDriver_adreno.so
-vendor/lib/libsc-a2xx.so
-vendor/lib/libsc-a3xx.so
-vendor/lib/libscale.so
-vendor/lib/libsmemlog.so
-vendor/lib/libssd.so
-vendor/lib/libsystem_health_mon.so
-vendor/lib/libtime_genoff.so
-vendor/lib/libtzplayready.so
-vendor/lib/libulp2.so
-vendor/lib/libwifiscanner.so
-vendor/lib/libwvdrm_L1.so
-vendor/lib/libwvm.so
-vendor/lib/libWVStreamControlAPI_L1.so
-vendor/lib/libxml.so
-vendor/lib/libxtadapter.so
-vendor/lib/libxt_native.so
-vendor/lib/libxtwifi_ulp_adaptor.so
-vendor/lib/libxtwifi_zpp_adaptor.so
-vendor/lib/mediadrm/libwvdrmengine.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 15b5f2d..aa3c60f 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -29,9 +29,6 @@ etc/gps.conf
 etc/izat.conf
 etc/lowi.conf
 etc/msap.conf
-etc/permissions/com.qualcomm.location.xml
-etc/permissions/qcnvitems.xml
-etc/permissions/qcrilhook.xml
 etc/quipc.conf
 etc/sap.conf
 etc/xtra_root_cert.pem
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 1cf445a..ff22257 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -23,10 +23,6 @@ MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk
 
 # This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
 
-#Prebuilt libraries that are needed to build open-source libraries
-PRODUCT_COPY_FILES := \
-    vendor/motorola/condor/proprietary/vendor/lib/libtime_genoff.so:obj/lib/libtime_genoff.so
-
 PRODUCT_COPY_FILES += \\
 EOF