aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralthafvly <althafvly@gmail.com>2020-05-29 20:34:23 +0530
committeralthafvly <althafvly@gmail.com>2020-06-07 00:05:45 +0530
commite25c981a0bde1532084a4dc2119fef874da3b3e5 (patch)
treedccbf7da1d2bebd476b1ad985e285ed3810a5b36
parent14dd719f9ee9a6849b3b0cbc7402f3c1ba1df05b (diff)
merlin: Move blobs to vendor
Move all possible blobs to vendor also update blobs list Change-Id: I17cef301ad0d3d572dce0b896f2046c4db14c564
-rw-r--r--BoardConfig.mk2
-rw-r--r--device.mk2
-rw-r--r--proprietary-files.txt48
3 files changed, 26 insertions, 26 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index cefd578..01ed4a3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -28,7 +28,7 @@ BOARD_GLOBAL_CFLAGS += -DCONFIG_MSM_USES_M_STACK
TARGET_HAS_LEGACY_CAMERA_HAL1 := true
TARGET_PROCESS_SDK_VERSION_OVERRIDE := \
/system/bin/mediaserver=23 \
- /system/bin/mm-qcamera-daemon=23
+ /vendor/bin/mm-qcamera-daemon=23
# Kernel
TARGET_KERNEL_CONFIG := merlin_defconfig
diff --git a/device.mk b/device.mk
index f60e8f7..0ca447b 100644
--- a/device.mk
+++ b/device.mk
@@ -57,4 +57,4 @@ PRODUCT_PACKAGES += \
# Thermal
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/thermal-engine-merlin.conf:system/etc/thermal-engine-merlin.conf
+ $(LOCAL_PATH)/configs/thermal-engine-merlin.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-merlin.conf
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c3ba06e..396a25c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,29 +1,29 @@
# Proprietary files for merlin
# Audio
-etc/acdbdata/Bluetooth_cal.acdb
-etc/acdbdata/General_cal.acdb
-etc/acdbdata/Global_cal.acdb
-etc/acdbdata/Handset_cal.acdb
-etc/acdbdata/Hdmi_cal.acdb
-etc/acdbdata/Headset_cal.acdb
-etc/acdbdata/Speaker_cal.acdb
+vendor/etc/acdbdata/Bluetooth_cal.acdb
+vendor/etc/acdbdata/General_cal.acdb
+vendor/etc/acdbdata/Global_cal.acdb
+vendor/etc/acdbdata/Handset_cal.acdb
+vendor/etc/acdbdata/Hdmi_cal.acdb
+vendor/etc/acdbdata/Headset_cal.acdb
+vendor/etc/acdbdata/Speaker_cal.acdb
# Camera
-bin/mm-qcamera-daemon
-lib/libadvalgcore.so
-lib/libcamerabgproc-jni.so
-lib/libcamerabgprocservice.so
-lib/libjscore.so
-lib/libjustshoot.so
-lib/libmm-qcamera.so
-lib/libmmcamera_interface.so
-lib/libmmcamera_lux_standardization.so
-lib/libmmjpeg_interface.so
-lib/libmot-qc-fd-offline.so
-lib/libmotocalibration.so
-lib/libqomx_core.so
-lib/hw/camera.msm8916.so:lib/hw/camera.vendor.msm8916.so
+vendor/bin/mm-qcamera-daemon
+vendor/lib/libadvalgcore.so
+vendor/lib/libcamerabgproc-jni.so
+vendor/lib/libcamerabgprocservice.so
+vendor/lib/libjscore.so
+vendor/lib/libjustshoot.so
+vendor/lib/libmm-qcamera.so
+vendor/lib/libmmcamera_interface.so
+vendor/lib/libmmcamera_lux_standardization.so
+vendor/lib/libmmjpeg_interface.so
+vendor/lib/libmot-qc-fd-offline.so
+vendor/lib/libmotocalibration.so
+vendor/lib/libqomx_core.so
+vendor/lib/hw/camera.msm8916.so:lib/hw/camera.vendor.msm8916.so
vendor/lib/libactuator_ak7345.so
vendor/lib/libactuator_ak7345_camcorder.so
vendor/lib/libactuator_ak7345_camera.so
@@ -119,8 +119,8 @@ vendor/lib/libchromatix_s5k5e2_preview.so
vendor/lib/libchromatix_s5k5e2_snapshot.so
# Touchscreen
-etc/firmware/synaptics-boe-s2726-15111801-1f711a-merlin.tdat
-etc/firmware/synaptics-inx-s2726br_t-15111103-1f711a-merlin.tdat
+vendor/firmware/synaptics-boe-s2726-15111801-1f711a-merlin.tdat
+vendor/firmware/synaptics-inx-s2726br_t-15111103-1f711a-merlin.tdat
# WCNSS
-etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
+vendor/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin