marlin/sailfish: Proprietary file updates for Q

* Update path for items moved to product/ * Update for all changes that were done to stock vendor img Change-Id: I93f6537647fdecf987d4c439224831345e94dfce
jacko9000 · Sep 28, 2019 · 13107a4 · 13107a4
1 parent 0b2a4a8
commit 13107a4
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 96 deletions.
diff --git a/Android.mk b/Android.mk
@@ -40,12 +40,12 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
 
 DM_LIBS := libdmengine.so libdmjavaplugin.so
-DM_SYMLINKS := $(addprefix $(TARGET_OUT)/priv-app/DMService/lib/arm/,$(notdir $(DM_LIBS)))
+DM_SYMLINKS := $(addprefix $(TARGET_OUT_PRODUCT)/priv-app/DMService/lib/arm/,$(notdir $(DM_LIBS)))
 $(DM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "DMService lib link: $@"
 	@mkdir -p $(dir $@)
 	@rm -rf $@
-	$(hide) ln -sf /system/lib/$(notdir $@) $@
+	$(hide) ln -sf /system/product/lib/$(notdir $@) $@
 
 ALL_DEFAULT_INSTALLED_MODULES += $(DM_SYMLINKS)
 

diff --git a/marlin/device-proprietary-files-vendor.txt b/marlin/device-proprietary-files-vendor.txt
@@ -99,10 +99,6 @@ vendor/etc/izat.conf
 vendor/etc/lowi.conf
 vendor/etc/modem_stat.conf
 vendor/etc/perf-profile0.conf
-vendor/etc/permissions/LowPowerMonitorDeviceInterface.xml
-vendor/etc/permissions/LowPowerMonitorDeviceStub.xml
-vendor/etc/permissions/PowerAnomalyDataModemInterface.xml
-vendor/etc/permissions/PowerAnomalyStub.xml
 vendor/etc/permissions/embms.xml
 vendor/etc/permissions/qcrilhook.xml
 vendor/etc/permissions/qti_permissions.xml
@@ -299,6 +295,9 @@ vendor/lib64/libfastcvopt.so
 vendor/lib64/libflp.so
 vendor/lib64/lib_fpc_tac_shared.so
 vendor/lib64/libgeofence.so
+vendor/lib64/libgooglecamerahal.so
+vendor/lib64/libgoogle_camera_hal_tests.so
+vendor/lib64/libgooglecamerahalutils.so
 vendor/lib64/libGPreqcancel.so
 vendor/lib64/libGPreqcancel_svc.so
 vendor/lib64/libgps.utils.so
@@ -327,8 +326,10 @@ vendor/lib64/libmdmimgload.so
 vendor/lib64/libmdsprpc.so
 vendor/lib64/libmmcamera_dbg.so
 vendor/lib64/libmm-disp-apis.so
+vendor/lib64/libmm-dspp-utils.so
 vendor/lib64/libmm-hdcpmgr.so
 vendor/lib64/libmm-qdcm.so
+vendor/lib64/libmm-qdcm-diag.so
 vendor/lib64/libnetmgr.so
 vendor/lib64/libperipheral_client.so
 vendor/lib64/libpvr.so
@@ -392,6 +393,7 @@ vendor/lib64/libtime_genoff.so
 vendor/lib64/libTimeService.so
 vendor/lib64/libtzdrmgenprov.so
 vendor/lib64/libwms.so
+vendor/lib64/libwvhidl.so
 vendor/lib64/libxml.so
 vendor/lib/dsp/EtsiEaacPlusEncAndCmnModule.so.1
 vendor/lib/dsp/fastrpc_shell_0
@@ -483,6 +485,9 @@ vendor/lib/libflp.so
 vendor/lib/libgcam_ae.so
 vendor/lib/libgeofence.so
 vendor/lib/libgoog_eis_armeabi-v7a.so
+vendor/lib/libgooglecamerahal.so
+vendor/lib/libgoogle_camera_hal_tests.so
+vendor/lib/libgooglecamerahalutils.so
 vendor/lib/libGPreqcancel.so
 vendor/lib/libGPreqcancel_svc.so
 vendor/lib/libgps.utils.so
@@ -586,9 +591,11 @@ vendor/lib/libmmcamera_tintless_bg_pca_algo.so
 vendor/lib/libmmcamera_tuning_lookup.so
 vendor/lib/libmmcamera_tuning.so
 vendor/lib/libmm-disp-apis.so
+vendor/lib/libmm-dspp-utils.so
 vendor/lib/libmm-hdcpmgr.so
 vendor/lib/libmmjpeg.so
 vendor/lib/libmm-qdcm.so
+vendor/lib/libmm-qdcm-diag.so
 vendor/lib/libmmqjpeg_codec.so
 vendor/lib/libmmqjpegdma.so
 vendor/lib/libnetmgr.so
@@ -674,4 +681,8 @@ vendor/qcril_database/upgrade/2_db_upgrade.sql
 vendor/qcril_database/upgrade/3_remove_ecc_999_from_us_and_canada.sql
 vendor/qcril_database/upgrade/4_db_upgrade.sql
 vendor/qcril_database/upgrade/5_update_india_ecc.sql
+vendor/qcril_database/upgrade/6_recheck_ecc_setting.sql
+vendor/qcril_database/upgrade/7_singapore_ecc_995.sql
+vendor/qcril_database/upgrade/8_germany_ecc_110.sql
+vendor/qcril_database/upgrade/9_remove_germany_ecc_110.sql
 vendor/qcril.db
diff --git a/marlin/device-proprietary-files.txt b/marlin/device-proprietary-files.txt
@@ -1,6 +1,6 @@
 # Bluetooth
-lib64/libaptX_encoder.so
-lib64/libaptXHD_encoder.so
+product/lib64/libaptX_encoder.so
+product/lib64/libaptXHD_encoder.so
 lib/libaptX_encoder.so
 lib/libaptXHD_encoder.so
 
@@ -17,9 +17,8 @@ etc/cne/Nexus/VZW/VZW_profiles.xml
 bin/move_widevine_data.sh
 
 # Hotword Enrollment
--priv-app/HotwordEnrollmentOKGoogleWCD9335/HotwordEnrollmentOKGoogleWCD9335.apk;PRESIGNED
--priv-app/HotwordEnrollmentTGoogleWCD9335/HotwordEnrollmentTGoogleWCD9335.apk;PRESIGNED
--priv-app/HotwordEnrollmentXGoogleWCD9335/HotwordEnrollmentXGoogleWCD9335.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentOKGoogleWCD9335/HotwordEnrollmentOKGoogleWCD9335.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentXGoogleWCD9335/HotwordEnrollmentXGoogleWCD9335.apk;PRESIGNED
 
 # IMS/HD Voice
 -app/ims/ims.apk
@@ -38,55 +37,51 @@ lib/lib-imsvtutils.so
 lib/librcc.so
 
 # Permissions
-etc/permissions/privapp-permissions-google.xml
+product/etc/permissions/privapp-permissions-google-p.xml
+product/etc/permissions/privapp-permissions-google-ps.xml
 
 # RIL
--framework/LowPowerMonitorDeviceInterface.jar
--framework/LowPowerMonitorDeviceStub.jar
--framework/PowerAnomalyDataModemInterface.jar
--framework/PowerAnomalyStub.jar
 -framework/qcrilhook.jar
--priv-app/Asdiv/Asdiv.apk
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 lib64/[email protected]
 lib64/[email protected]
 
 # Sprint
-etc/permissions/com.android.omadm.service.xml
-etc/permissions/com.android.sdm.plugins.sprintdm.xml
-etc/sysconfig/whitelist_com.android.omadm.service.xml
-lib/libdmengine.so
-lib/libdmjavaplugin.so
--priv-app/DMService/DMService.apk
--priv-app/DiagMon/DiagMon.apk
--priv-app/SprintDM/SprintDM.apk
--priv-app/SprintHM/SprintHM.apk
+product/etc/permissions/com.android.omadm.service.xml
+product/etc/permissions/com.android.sdm.plugins.diagmon.xml
+product/etc/permissions/com.android.sdm.plugins.sprintdm.xml
+product/etc/sysconfig/whitelist_com.android.omadm.service.xml
+product/lib/libdmengine.so
+product/lib/libdmjavaplugin.so
+-product/priv-app/DMService/DMService.apk
+-product/priv-app/DiagMon/DiagMon.apk
+-product/priv-app/SprintDM/SprintDM.apk
+-product/priv-app/SprintHM/SprintHM.apk
 
 # Sysconfig
-etc/sysconfig/nexus.xml
 etc/sysconfig/pixel_2016_exclusive.xml
+product/etc/sysconfig/nexus.xml
 
 # VZW
--app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED
-etc/permissions/com.android.sdm.plugins.connmo.xml
+-product/app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED
+product/etc/permissions/com.android.sdm.plugins.connmo.xml
+product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 etc/permissions/com.android.vzwomatrigger.xml
-etc/permissions/com.verizon.apn.xml
+product/etc/permissions/com.verizon.apn.xml
 etc/permissions/com.verizon.embms.xml
-etc/permissions/com.verizon.provider.xml
 etc/permissions/com.verizon.services.xml
-etc/permissions/features-verizon.xml
-etc/permissions/obdm_permissions.xml
-etc/permissions/vzw_mvs_permissions.xml
--framework/VerizonUnifiedSettings.jar;PRESIGNED
--priv-app/CarrierSetup/CarrierSetup.apk
--priv-app/ConnMO/ConnMO.apk
--priv-app/DCMO/DCMO.apk
-priv-app/MyVerizonServices/lib/arm64/libakuaf.so
-priv-app/MyVerizonServices/lib/arm64/libmotricity.so
--priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
--priv-app/OBDM_Permissions/OBDM_Permissions.apk
+product/etc/permissions/features-verizon.xml
+product/etc/permissions/obdm_permissions.xml
+product/etc/permissions/vzw_mvs_permissions.xml
+product/etc/sysconfig/vzw_mvs_sysconfig.xml
+-product/priv-app/CarrierSetup/CarrierSetup.apk
+-product/priv-app/ConnMO/ConnMO.apk
+-product/priv-app/DCMO/DCMO.apk
+product/priv-app/MyVerizonServices/lib/arm64/libakuaf.so
+product/priv-app/MyVerizonServices/lib/arm64/libmotricity.so
+-product/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
+-product/priv-app/OBDM_Permissions/OBDM_Permissions.apk
 -priv-app/OemDmTrigger/OemDmTrigger.apk
--priv-app/VerizonAuthDialog/VerizonAuthDialog.apk;PRESIGNED
 -priv-app/VzwOmaTrigger/VzwOmaTrigger.apk;PRESIGNED
--priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
--priv-app/obdm_stub/obdm_stub.apk;PRESIGNED
+-product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
+-product/priv-app/obdm_stub/obdm_stub.apk;PRESIGNED
diff --git a/marlin/extract-files.sh b/marlin/extract-files.sh
@@ -54,8 +54,4 @@ setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
 extract "$MY_DIR/$DEVICE"/device-proprietary-files.txt "$SRC"
 extract "$MY_DIR/$DEVICE"/device-proprietary-files-vendor.txt "$SRC"
 
-# Don't disable MyVerizonServices app
-sed -i 's|<disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" />|<!--disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" /-->|g'\
-    "$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml
-
 "$MY_DIR/$DEVICE"/setup-makefiles.sh
diff --git a/sailfish/device-proprietary-files-vendor.txt b/sailfish/device-proprietary-files-vendor.txt
@@ -99,10 +99,6 @@ vendor/etc/izat.conf
 vendor/etc/lowi.conf
 vendor/etc/modem_stat.conf
 vendor/etc/perf-profile0.conf
-vendor/etc/permissions/LowPowerMonitorDeviceInterface.xml
-vendor/etc/permissions/LowPowerMonitorDeviceStub.xml
-vendor/etc/permissions/PowerAnomalyDataModemInterface.xml
-vendor/etc/permissions/PowerAnomalyStub.xml
 vendor/etc/permissions/embms.xml
 vendor/etc/permissions/qcrilhook.xml
 vendor/etc/permissions/qti_permissions.xml
@@ -298,6 +294,9 @@ vendor/lib64/libfastcvopt.so
 vendor/lib64/libflp.so
 vendor/lib64/lib_fpc_tac_shared.so
 vendor/lib64/libgeofence.so
+vendor/lib64/libgooglecamerahal.so
+vendor/lib64/libgoogle_camera_hal_tests.so
+vendor/lib64/libgooglecamerahalutils.so
 vendor/lib64/libGPreqcancel.so
 vendor/lib64/libGPreqcancel_svc.so
 vendor/lib64/libgps.utils.so
@@ -326,8 +325,10 @@ vendor/lib64/libmdmimgload.so
 vendor/lib64/libmdsprpc.so
 vendor/lib64/libmmcamera_dbg.so
 vendor/lib64/libmm-disp-apis.so
+vendor/lib64/libmm-dspp-utils.so
 vendor/lib64/libmm-hdcpmgr.so
 vendor/lib64/libmm-qdcm.so
+vendor/lib64/libmm-qdcm-diag.so
 vendor/lib64/libnetmgr.so
 vendor/lib64/libperipheral_client.so
 vendor/lib64/libpvr.so
@@ -391,6 +392,7 @@ vendor/lib64/libtime_genoff.so
 vendor/lib64/libTimeService.so
 vendor/lib64/libtzdrmgenprov.so
 vendor/lib64/libwms.so
+vendor/lib64/libwvhidl.so
 vendor/lib64/libxml.so
 vendor/lib/dsp/EtsiEaacPlusEncAndCmnModule.so.1
 vendor/lib/dsp/fastrpc_shell_0
@@ -482,6 +484,9 @@ vendor/lib/libflp.so
 vendor/lib/libgcam_ae.so
 vendor/lib/libgeofence.so
 vendor/lib/libgoog_eis_armeabi-v7a.so
+vendor/lib/libgooglecamerahal.so
+vendor/lib/libgoogle_camera_hal_tests.so
+vendor/lib/libgooglecamerahalutils.so
 vendor/lib/libGPreqcancel.so
 vendor/lib/libGPreqcancel_svc.so
 vendor/lib/libgps.utils.so
@@ -585,9 +590,11 @@ vendor/lib/libmmcamera_tintless_bg_pca_algo.so
 vendor/lib/libmmcamera_tuning_lookup.so
 vendor/lib/libmmcamera_tuning.so
 vendor/lib/libmm-disp-apis.so
+vendor/lib/libmm-dspp-utils.so
 vendor/lib/libmm-hdcpmgr.so
 vendor/lib/libmmjpeg.so
 vendor/lib/libmm-qdcm.so
+vendor/lib/libmm-qdcm-diag.so
 vendor/lib/libmmqjpeg_codec.so
 vendor/lib/libmmqjpegdma.so
 vendor/lib/libnetmgr.so
@@ -673,4 +680,8 @@ vendor/qcril_database/upgrade/2_db_upgrade.sql
 vendor/qcril_database/upgrade/3_remove_ecc_999_from_us_and_canada.sql
 vendor/qcril_database/upgrade/4_db_upgrade.sql
 vendor/qcril_database/upgrade/5_update_india_ecc.sql
+vendor/qcril_database/upgrade/6_recheck_ecc_setting.sql
+vendor/qcril_database/upgrade/7_singapore_ecc_995.sql
+vendor/qcril_database/upgrade/8_germany_ecc_110.sql
+vendor/qcril_database/upgrade/9_remove_germany_ecc_110.sql
 vendor/qcril.db
diff --git a/sailfish/device-proprietary-files.txt b/sailfish/device-proprietary-files.txt
@@ -1,6 +1,6 @@
 # Bluetooth
-lib64/libaptX_encoder.so
-lib64/libaptXHD_encoder.so
+product/lib64/libaptX_encoder.so
+product/lib64/libaptXHD_encoder.so
 lib/libaptX_encoder.so
 lib/libaptXHD_encoder.so
 
@@ -17,9 +17,8 @@ etc/cne/Nexus/VZW/VZW_profiles.xml
 bin/move_widevine_data.sh
 
 # Hotword Enrollment
--priv-app/HotwordEnrollmentOKGoogleWCD9335/HotwordEnrollmentOKGoogleWCD9335.apk;PRESIGNED
--priv-app/HotwordEnrollmentTGoogleWCD9335/HotwordEnrollmentTGoogleWCD9335.apk;PRESIGNED
--priv-app/HotwordEnrollmentXGoogleWCD9335/HotwordEnrollmentXGoogleWCD9335.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentOKGoogleWCD9335/HotwordEnrollmentOKGoogleWCD9335.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentXGoogleWCD9335/HotwordEnrollmentXGoogleWCD9335.apk;PRESIGNED
 
 # IMS/HD Voice
 -app/ims/ims.apk
@@ -38,55 +37,51 @@ lib/lib-imsvtutils.so
 lib/librcc.so
 
 # Permissions
-etc/permissions/privapp-permissions-google.xml
+product/etc/permissions/privapp-permissions-google-p.xml
+product/etc/permissions/privapp-permissions-google-ps.xml
 
 # RIL
--framework/LowPowerMonitorDeviceInterface.jar
--framework/LowPowerMonitorDeviceStub.jar
--framework/PowerAnomalyDataModemInterface.jar
--framework/PowerAnomalyStub.jar
 -framework/qcrilhook.jar
--priv-app/Asdiv/Asdiv.apk
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 lib64/[email protected]
 lib64/[email protected]
 
 # Sprint
-etc/permissions/com.android.omadm.service.xml
-etc/permissions/com.android.sdm.plugins.sprintdm.xml
-etc/sysconfig/whitelist_com.android.omadm.service.xml
-lib/libdmengine.so
-lib/libdmjavaplugin.so
--priv-app/DMService/DMService.apk
--priv-app/DiagMon/DiagMon.apk
--priv-app/SprintDM/SprintDM.apk
--priv-app/SprintHM/SprintHM.apk
+product/etc/permissions/com.android.omadm.service.xml
+product/etc/permissions/com.android.sdm.plugins.diagmon.xml
+product/etc/permissions/com.android.sdm.plugins.sprintdm.xml
+product/etc/sysconfig/whitelist_com.android.omadm.service.xml
+product/lib/libdmengine.so
+product/lib/libdmjavaplugin.so
+-product/priv-app/DMService/DMService.apk
+-product/priv-app/DiagMon/DiagMon.apk
+-product/priv-app/SprintDM/SprintDM.apk
+-product/priv-app/SprintHM/SprintHM.apk
 
 # Sysconfig
-etc/sysconfig/nexus.xml
 etc/sysconfig/pixel_2016_exclusive.xml
+product/etc/sysconfig/nexus.xml
 
 # VZW
--app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED
-etc/permissions/com.android.sdm.plugins.connmo.xml
+-product/app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED
+product/etc/permissions/com.android.sdm.plugins.connmo.xml
+product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 etc/permissions/com.android.vzwomatrigger.xml
-etc/permissions/com.verizon.apn.xml
+product/etc/permissions/com.verizon.apn.xml
 etc/permissions/com.verizon.embms.xml
-etc/permissions/com.verizon.provider.xml
 etc/permissions/com.verizon.services.xml
-etc/permissions/features-verizon.xml
-etc/permissions/obdm_permissions.xml
-etc/permissions/vzw_mvs_permissions.xml
--framework/VerizonUnifiedSettings.jar;PRESIGNED
--priv-app/CarrierSetup/CarrierSetup.apk
--priv-app/ConnMO/ConnMO.apk
--priv-app/DCMO/DCMO.apk
-priv-app/MyVerizonServices/lib/arm64/libakuaf.so
-priv-app/MyVerizonServices/lib/arm64/libmotricity.so
--priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
--priv-app/OBDM_Permissions/OBDM_Permissions.apk
+product/etc/permissions/features-verizon.xml
+product/etc/permissions/obdm_permissions.xml
+product/etc/permissions/vzw_mvs_permissions.xml
+product/etc/sysconfig/vzw_mvs_sysconfig.xml
+-product/priv-app/CarrierSetup/CarrierSetup.apk
+-product/priv-app/ConnMO/ConnMO.apk
+-product/priv-app/DCMO/DCMO.apk
+product/priv-app/MyVerizonServices/lib/arm64/libakuaf.so
+product/priv-app/MyVerizonServices/lib/arm64/libmotricity.so
+-product/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
+-product/priv-app/OBDM_Permissions/OBDM_Permissions.apk
 -priv-app/OemDmTrigger/OemDmTrigger.apk
--priv-app/VerizonAuthDialog/VerizonAuthDialog.apk;PRESIGNED
 -priv-app/VzwOmaTrigger/VzwOmaTrigger.apk;PRESIGNED
--priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
--priv-app/obdm_stub/obdm_stub.apk;PRESIGNED
+-product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
+-product/priv-app/obdm_stub/obdm_stub.apk;PRESIGNED
diff --git a/sailfish/extract-files.sh b/sailfish/extract-files.sh
@@ -54,8 +54,4 @@ setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
 extract "$MY_DIR"/../marlin/$DEVICE/device-proprietary-files.txt "$SRC"
 extract "$MY_DIR"/../marlin/$DEVICE/device-proprietary-files-vendor.txt "$SRC"
 
-# Don't disable MyVerizonServices app
-sed -i 's|<disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" />|<!--disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" /-->|g'\
-    "$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml
-
 "$MY_DIR/../marlin/$DEVICE"/setup-makefiles.sh