zenfone7: Add system prefix to proprietary libraries in /system
Change-Id: I9ac038d474d5cbe1f7eb5128d6ea8eea3a82f318
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 505dfa2..dbbd2fd 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -14,34 +14,34 @@
-system_ext/framework/audiosphere.jar
# Camera
-lib64/DataSet/arch/DIT_List.cfg
-lib64/DataSet/ditSCidGen/msgchk.db
-lib64/DataSet/ispDB/ParameterDB.db
-lib64/libxditk_DIT_MSMv1.so
-lib64/libxditk_DIT_Manager.so
-lib64/libxditk_ISP.so
-lib64/libxditk_arch.so
-lib64/libxditk_ditArchLIB.so
-lib64/libxditk_ditBSP.so
-lib64/libxditk_ditBSP_JNI.so
--priv-app/AsusCamera/AsusCamera.apk;OVERRIDES=Camera2
-priv-app/AsusCamera/lib/arm64/libarcsoft_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_burstcapture.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_interval_capture.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_rog3.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_zf7.so
-priv-app/AsusCamera/lib/arm64/libasusundistort.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_interval_panorama.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_panorama.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_selfiepano.so
-priv-app/AsusCamera/lib/arm64/libbitmap.so
-priv-app/AsusCamera/lib/arm64/libmpbase.so
-priv-app/AsusCamera/lib/arm64/librenderscript-toolkit.so
-priv-app/AsusCamera/lib/arm64/libtensorflowlite_jni.so
-priv-app/AsusCamera/lib/arm64/libUndistort.so
-priv-app/AsusCamera/lib/arm64/libyuv_camera.so
-priv-app/AsusCamera/lib/arm64/libyuv_util.so
+system/lib64/DataSet/arch/DIT_List.cfg
+system/lib64/DataSet/ditSCidGen/msgchk.db
+system/lib64/DataSet/ispDB/ParameterDB.db
+system/lib64/libxditk_DIT_MSMv1.so
+system/lib64/libxditk_DIT_Manager.so
+system/lib64/libxditk_ISP.so
+system/lib64/libxditk_arch.so
+system/lib64/libxditk_ditArchLIB.so
+system/lib64/libxditk_ditBSP.so
+system/lib64/libxditk_ditBSP_JNI.so
+-system/priv-app/AsusCamera/AsusCamera.apk;OVERRIDES=Camera2
+system/priv-app/AsusCamera/lib/arm64/libarcsoft_object_tracking.so
+system/priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_burstcapture.so
+system/priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_interval_capture.so
+system/priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_rog3.so
+system/priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_zf7.so
+system/priv-app/AsusCamera/lib/arm64/libasusundistort.so
+system/priv-app/AsusCamera/lib/arm64/libasus_camera_interval_panorama.so
+system/priv-app/AsusCamera/lib/arm64/libasus_camera_object_tracking.so
+system/priv-app/AsusCamera/lib/arm64/libasus_camera_panorama.so
+system/priv-app/AsusCamera/lib/arm64/libasus_camera_selfiepano.so
+system/priv-app/AsusCamera/lib/arm64/libbitmap.so
+system/priv-app/AsusCamera/lib/arm64/libmpbase.so
+system/priv-app/AsusCamera/lib/arm64/librenderscript-toolkit.so
+system/priv-app/AsusCamera/lib/arm64/libtensorflowlite_jni.so
+system/priv-app/AsusCamera/lib/arm64/libUndistort.so
+system/priv-app/AsusCamera/lib/arm64/libyuv_camera.so
+system/priv-app/AsusCamera/lib/arm64/libyuv_util.so
system_ext/etc/hdr_config/ans_off/ans_config.txt
system_ext/etc/hdr_config/ans_on/ans_config.txt
@@ -175,7 +175,7 @@
-product/app/DeviceStatisticsService/DeviceStatisticsService.apk
# Display
--priv-app/AsusVisualMaster/AsusVisualMaster.apk
+-system/priv-app/AsusVisualMaster/AsusVisualMaster.apk
product/etc/permissions/com.qti.snapdragon.sdk.display.xml
-product/framework/com.qti.snapdragon.sdk.display.jar
-system_ext/app/colorservice/colorservice.apk
@@ -183,7 +183,7 @@
system_ext/lib64/libsd_sdk_display.qti.so
# DPM
--framework/tcmclient.jar
+-system/framework/tcmclient.jar
system_ext/bin/dpmd
system_ext/etc/dpm/dpm.conf
system_ext/etc/init/dpmd.rc
@@ -201,100 +201,100 @@
-system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
# Gallery
--priv-app/AsusGallery/AsusGallery.apk
-priv-app/AsusGallery/lib/arm64/libmpbase.so
-priv-app/AsusGallery/lib/arm64/libjni_filter_show.so
-priv-app/AsusGallery/lib/arm64/libtensorflowlite_jni.so
-priv-app/AsusGallery/lib/arm64/libjni_face_effect.so
-priv-app/AsusGallery/lib/arm64/librs.vignette.so
-priv-app/AsusGallery/lib/arm64/libtensorflow_inference.so
-priv-app/AsusGallery/lib/arm64/librs.convolve3x3.so
-priv-app/AsusGallery/lib/arm64/libpanorenderer.so
-priv-app/AsusGallery/lib/arm64/libpano_video_renderer.so
-priv-app/AsusGallery/lib/arm64/librsjni_androidx.so
-priv-app/AsusGallery/lib/arm64/librsjni.so
-priv-app/AsusGallery/lib/arm64/libgif.so
-priv-app/AsusGallery/lib/arm64/librs.grey.so
-priv-app/AsusGallery/lib/arm64/libarcsoft_beautyshot.so
-priv-app/AsusGallery/lib/arm64/librs.saturation.so
-priv-app/AsusGallery/lib/arm64/libblur.so
-priv-app/AsusGallery/lib/arm64/librs.grad.so
-priv-app/AsusGallery/lib/arm64/librs.blur.so
-priv-app/AsusGallery/lib/arm64/libRSSupport.so
-priv-app/AsusGallery/lib/arm64/libjni_wide_angle_undistort.so
-priv-app/AsusGallery/lib/arm64/libNvStreamingSdkCore.so
-priv-app/AsusGallery/lib/arm64/libgvr.so
-priv-app/AsusGallery/lib/arm64/libjni_cvface_api.so
-priv-app/AsusGallery/lib/arm64/libcvface_api.so
-priv-app/AsusGallery/lib/arm64/libarcsoft_undistort.so
-priv-app/AsusGallery/lib/arm64/libopencv_java3.so
+-system/priv-app/AsusGallery/AsusGallery.apk
+system/priv-app/AsusGallery/lib/arm64/libmpbase.so
+system/priv-app/AsusGallery/lib/arm64/libjni_filter_show.so
+system/priv-app/AsusGallery/lib/arm64/libtensorflowlite_jni.so
+system/priv-app/AsusGallery/lib/arm64/libjni_face_effect.so
+system/priv-app/AsusGallery/lib/arm64/librs.vignette.so
+system/priv-app/AsusGallery/lib/arm64/libtensorflow_inference.so
+system/priv-app/AsusGallery/lib/arm64/librs.convolve3x3.so
+system/priv-app/AsusGallery/lib/arm64/libpanorenderer.so
+system/priv-app/AsusGallery/lib/arm64/libpano_video_renderer.so
+system/priv-app/AsusGallery/lib/arm64/librsjni_androidx.so
+system/priv-app/AsusGallery/lib/arm64/librsjni.so
+system/priv-app/AsusGallery/lib/arm64/libgif.so
+system/priv-app/AsusGallery/lib/arm64/librs.grey.so
+system/priv-app/AsusGallery/lib/arm64/libarcsoft_beautyshot.so
+system/priv-app/AsusGallery/lib/arm64/librs.saturation.so
+system/priv-app/AsusGallery/lib/arm64/libblur.so
+system/priv-app/AsusGallery/lib/arm64/librs.grad.so
+system/priv-app/AsusGallery/lib/arm64/librs.blur.so
+system/priv-app/AsusGallery/lib/arm64/libRSSupport.so
+system/priv-app/AsusGallery/lib/arm64/libjni_wide_angle_undistort.so
+system/priv-app/AsusGallery/lib/arm64/libNvStreamingSdkCore.so
+system/priv-app/AsusGallery/lib/arm64/libgvr.so
+system/priv-app/AsusGallery/lib/arm64/libjni_cvface_api.so
+system/priv-app/AsusGallery/lib/arm64/libcvface_api.so
+system/priv-app/AsusGallery/lib/arm64/libarcsoft_undistort.so
+system/priv-app/AsusGallery/lib/arm64/libopencv_java3.so
# GalleryBurst
--priv-app/AsusGalleryBurst/AsusGalleryBurst.apk
-priv-app/AsusGalleryBurst/lib/arm/libgifencoder.so
+-system/priv-app/AsusGalleryBurst/AsusGalleryBurst.apk
+system/priv-app/AsusGalleryBurst/lib/arm/libgifencoder.so
# Gallery Video Editor
-etc/videoeditor/Soothing.mfim
-etc/videoeditor/Charming.mfim
-etc/videoeditor/Energetic.mfim
-etc/videoeditor/Lively.mfim
-etc/videoeditor/Graceful.mfim
-etc/videoeditor/Happy.mfim
-etc/videoeditor/Dynamic.mfim
+system/etc/videoeditor/Soothing.mfim
+system/etc/videoeditor/Charming.mfim
+system/etc/videoeditor/Energetic.mfim
+system/etc/videoeditor/Lively.mfim
+system/etc/videoeditor/Graceful.mfim
+system/etc/videoeditor/Happy.mfim
+system/etc/videoeditor/Dynamic.mfim
# Gallery Editor seven
-etc/videoeditor7/fx/61B3A8B9-C843-450D-AB93-56FF082FF120.videofx
-etc/videoeditor7/fx/89B2D082-5F47-4A6D-9FD0-9F1BB053F6A7.videofx
-etc/videoeditor7/fx/FE794398-0AA5-4A1C-8189-7A00B516CF0E.videofx
-etc/videoeditor7/fx/7D8A1839-B7D3-4C91-AD7A-8FB920322818.videofx
-etc/videoeditor7/fx/27C20D68-D75E-42F0-BD1A-0927D5B3A20C.videofx
-etc/videoeditor7/fx/394EB525-1B7A-4AA1-BBAD-3FD75527A60C.videofx
-etc/videoeditor7/fx/12BB667E-32CC-4511-BB3E-07BE054A2896.videofx
-etc/videoeditor7/fx/12FCD2E7-1F80-4DFC-A8FD-C820CF754855.videofx
-etc/videoeditor7/fx/52AEDFE9-E76E-4AE5-91C5-6C6466F335E2.videofx
-etc/videoeditor7/fx/576A09D7-766B-427F-AF19-E8BD6B6F2F1B.videofx
-etc/videoeditor7/fx/D71CB384-ECCA-48E6-B791-C15EDB326F56.videofx
-etc/videoeditor7/fx/F17F414B-B1E2-4FB8-BD29-FEFDA43FCB98.videofx
-etc/videoeditor7/fx/BCD1FAAD-D5C5-468F-A4F2-1C2138F485C0.videofx
-etc/videoeditor7/fx/749C7148-F6C7-418A-B177-3493994A5F84.videofx
-etc/videoeditor7/fx/A8A4344D-45DA-460F-A18F-C0E2355FE864.videofx
-etc/videoeditor7/fx/6439CF7E-42D5-4239-8187-358323292FF4.videofx
-etc/videoeditor7/fx/FE91A908-A0C1-424D-A9FF-05386BA49316.videofx
-etc/videoeditor7/fx/2215EC1E-A9EE-4B5C-89CB-BF488178C910.videofx
-etc/videoeditor7/fx/B7F1F498-B310-4E2D-9A75-7D8AFBBC71D8.videofx
-etc/videoeditor7/fx/8615918E-FEB9-47F8-AEAA-B648E61E9314.videofx
-etc/videoeditor7/theme/BA915657-4E49-4EBA-970F-26DBF2E88D60.theme
-etc/videoeditor7/theme/4923FF1B-6459-42C9-BC81-CC641C52F0C1.theme
-etc/videoeditor7/theme/D1DC85A4-3C8F-49D8-8EB4-6E30852EEC19.theme
-etc/videoeditor7/theme/D363C1F8-2D14-4D88-AB9D-1E8AEEF3AEFE.theme
-etc/videoeditor7/theme/249B5FAC-CC0B-4745-AFE2-46B875C80CDA.theme
-etc/videoeditor7/theme/0ABAAB00-D327-4650-A6C3-71252C6B752D.theme
-etc/videoeditor7/theme/3F3E7A79-3D3B-4B0B-B6B5-414C4DB6A283.theme
-etc/videoeditor7/theme/FBDF22EE-8908-4736-BEA9-BC10D3C0574D.theme
-etc/videoeditor7/theme/F2969925-7BA9-4C6D-A91C-6DE327EB9B30.theme
-etc/videoeditor7/theme/F91F37A8-BD10-40B5-A476-56019566D015.theme
-etc/videoeditor7/transition/641DC0DC-FDF9-4DF7-A268-C5F5B0E3293E.videotransition
-etc/videoeditor7/transition/54C93F85-C026-4EBE-80CD-F51C31D5E07D.videotransition
-etc/videoeditor7/transition/EB2B0E57-C3BF-4361-802A-90620C5CCEDE.videotransition
-etc/videoeditor7/transition/0F241EB7-BD8C-491F-BC46-8776FEDA4C97.videotransition
-etc/videoeditor7/transition/9CA48E0E-9523-4408-BEEA-DCCF7B5A4024.videotransition
-etc/videoeditor7/transition/FCC6384D-1459-4C44-B05F-496AFC472A83.videotransition
-etc/videoeditor7/transition/71EB679A-4B0F-4218-8F38-1B4BCBD48266.videotransition
-etc/videoeditor7/transition/3DEFF9D6-C2A4-4A1E-A817-BA90565D1AD4.videotransition
-etc/videoeditor7/transition/ECE4B448-D61B-49CB-BD17-580582703061.videotransition
-etc/videoeditor7/transition/8DD3F560-A587-4C09-9AEC-9DA38AA5D5C5.videotransition
-etc/videoeditor7/transition/D691C32F-D9E5-40B2-9718-C15224D6E121.videotransition
-etc/videoeditor7/transition/0499C962-9CDE-4B0C-A4DC-3F09C5A8D12E.videotransition
-etc/videoeditor7/music/5.mp3
-etc/videoeditor7/music/1.mp3
-etc/videoeditor7/music/3.mp3
-etc/videoeditor7/music/9.mp3
-etc/videoeditor7/music/10.mp3
-etc/videoeditor7/music/2.mp3
-etc/videoeditor7/music/6.mp3
-etc/videoeditor7/music/8.mp3
-etc/videoeditor7/music/4.mp3
-etc/videoeditor7/music/7.mp3
+system/etc/videoeditor7/fx/61B3A8B9-C843-450D-AB93-56FF082FF120.videofx
+system/etc/videoeditor7/fx/89B2D082-5F47-4A6D-9FD0-9F1BB053F6A7.videofx
+system/etc/videoeditor7/fx/FE794398-0AA5-4A1C-8189-7A00B516CF0E.videofx
+system/etc/videoeditor7/fx/7D8A1839-B7D3-4C91-AD7A-8FB920322818.videofx
+system/etc/videoeditor7/fx/27C20D68-D75E-42F0-BD1A-0927D5B3A20C.videofx
+system/etc/videoeditor7/fx/394EB525-1B7A-4AA1-BBAD-3FD75527A60C.videofx
+system/etc/videoeditor7/fx/12BB667E-32CC-4511-BB3E-07BE054A2896.videofx
+system/etc/videoeditor7/fx/12FCD2E7-1F80-4DFC-A8FD-C820CF754855.videofx
+system/etc/videoeditor7/fx/52AEDFE9-E76E-4AE5-91C5-6C6466F335E2.videofx
+system/etc/videoeditor7/fx/576A09D7-766B-427F-AF19-E8BD6B6F2F1B.videofx
+system/etc/videoeditor7/fx/D71CB384-ECCA-48E6-B791-C15EDB326F56.videofx
+system/etc/videoeditor7/fx/F17F414B-B1E2-4FB8-BD29-FEFDA43FCB98.videofx
+system/etc/videoeditor7/fx/BCD1FAAD-D5C5-468F-A4F2-1C2138F485C0.videofx
+system/etc/videoeditor7/fx/749C7148-F6C7-418A-B177-3493994A5F84.videofx
+system/etc/videoeditor7/fx/A8A4344D-45DA-460F-A18F-C0E2355FE864.videofx
+system/etc/videoeditor7/fx/6439CF7E-42D5-4239-8187-358323292FF4.videofx
+system/etc/videoeditor7/fx/FE91A908-A0C1-424D-A9FF-05386BA49316.videofx
+system/etc/videoeditor7/fx/2215EC1E-A9EE-4B5C-89CB-BF488178C910.videofx
+system/etc/videoeditor7/fx/B7F1F498-B310-4E2D-9A75-7D8AFBBC71D8.videofx
+system/etc/videoeditor7/fx/8615918E-FEB9-47F8-AEAA-B648E61E9314.videofx
+system/etc/videoeditor7/theme/BA915657-4E49-4EBA-970F-26DBF2E88D60.theme
+system/etc/videoeditor7/theme/4923FF1B-6459-42C9-BC81-CC641C52F0C1.theme
+system/etc/videoeditor7/theme/D1DC85A4-3C8F-49D8-8EB4-6E30852EEC19.theme
+system/etc/videoeditor7/theme/D363C1F8-2D14-4D88-AB9D-1E8AEEF3AEFE.theme
+system/etc/videoeditor7/theme/249B5FAC-CC0B-4745-AFE2-46B875C80CDA.theme
+system/etc/videoeditor7/theme/0ABAAB00-D327-4650-A6C3-71252C6B752D.theme
+system/etc/videoeditor7/theme/3F3E7A79-3D3B-4B0B-B6B5-414C4DB6A283.theme
+system/etc/videoeditor7/theme/FBDF22EE-8908-4736-BEA9-BC10D3C0574D.theme
+system/etc/videoeditor7/theme/F2969925-7BA9-4C6D-A91C-6DE327EB9B30.theme
+system/etc/videoeditor7/theme/F91F37A8-BD10-40B5-A476-56019566D015.theme
+system/etc/videoeditor7/transition/641DC0DC-FDF9-4DF7-A268-C5F5B0E3293E.videotransition
+system/etc/videoeditor7/transition/54C93F85-C026-4EBE-80CD-F51C31D5E07D.videotransition
+system/etc/videoeditor7/transition/EB2B0E57-C3BF-4361-802A-90620C5CCEDE.videotransition
+system/etc/videoeditor7/transition/0F241EB7-BD8C-491F-BC46-8776FEDA4C97.videotransition
+system/etc/videoeditor7/transition/9CA48E0E-9523-4408-BEEA-DCCF7B5A4024.videotransition
+system/etc/videoeditor7/transition/FCC6384D-1459-4C44-B05F-496AFC472A83.videotransition
+system/etc/videoeditor7/transition/71EB679A-4B0F-4218-8F38-1B4BCBD48266.videotransition
+system/etc/videoeditor7/transition/3DEFF9D6-C2A4-4A1E-A817-BA90565D1AD4.videotransition
+system/etc/videoeditor7/transition/ECE4B448-D61B-49CB-BD17-580582703061.videotransition
+system/etc/videoeditor7/transition/8DD3F560-A587-4C09-9AEC-9DA38AA5D5C5.videotransition
+system/etc/videoeditor7/transition/D691C32F-D9E5-40B2-9718-C15224D6E121.videotransition
+system/etc/videoeditor7/transition/0499C962-9CDE-4B0C-A4DC-3F09C5A8D12E.videotransition
+system/etc/videoeditor7/music/5.mp3
+system/etc/videoeditor7/music/1.mp3
+system/etc/videoeditor7/music/3.mp3
+system/etc/videoeditor7/music/9.mp3
+system/etc/videoeditor7/music/10.mp3
+system/etc/videoeditor7/music/2.mp3
+system/etc/videoeditor7/music/6.mp3
+system/etc/videoeditor7/music/8.mp3
+system/etc/videoeditor7/music/4.mp3
+system/etc/videoeditor7/music/7.mp3
# GPS
system_ext/etc/permissions/com.qti.location.sdk.xml
@@ -323,17 +323,17 @@
system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0.so
# Motor
-etc/permissions/asus.hardware.motor.latch_lock.xml
--priv-app/MotorService/MotorService.apk
-priv-app/MotorService/lib/arm64/libAsusMotorDriverHAL.so
-priv-app/MotorService/lib/arm64/libjni_motor.so
--priv-app/MotorK/MotorK.apk
-priv-app/MotorK/lib/arm64/libAsusMotorDriverHAL.so
-priv-app/MotorK/lib/arm64/libmotork-jni.so
+system/etc/permissions/asus.hardware.motor.latch_lock.xml
+-system/priv-app/MotorService/MotorService.apk
+system/priv-app/MotorService/lib/arm64/libAsusMotorDriverHAL.so
+system/priv-app/MotorService/lib/arm64/libjni_motor.so
+-system/priv-app/MotorK/MotorK.apk
+system/priv-app/MotorK/lib/arm64/libAsusMotorDriverHAL.so
+system/priv-app/MotorK/lib/arm64/libmotork-jni.so
# Power
--framework/QPerformance.jar
--framework/UxPerformance.jar
+-system/framework/QPerformance.jar
+-system/framework/UxPerformance.jar
# Telephony
product/etc/permissions/telephony_product_privapp-permissions-qti.xml
@@ -347,10 +347,10 @@
-system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
# Wifi
--framework/android.hardware.wifi.supplicant-V1.0-java.jar
--framework/android.hardware.wifi.supplicant-V1.1-java.jar
--framework/android.hardware.wifi.supplicant-V1.2-java.jar
--framework/android.hardware.wifi.supplicant-V1.3-java.jar
+-system/framework/android.hardware.wifi.supplicant-V1.0-java.jar
+-system/framework/android.hardware.wifi.supplicant-V1.1-java.jar
+-system/framework/android.hardware.wifi.supplicant-V1.2-java.jar
+-system/framework/android.hardware.wifi.supplicant-V1.3-java.jar
# Wlan
-system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar