g12-common: Automatically add apk/jar/vintf fragments to PRODUCT_PACKAGES

Change-Id: Iaa9d66b0bbdc55f046ee1347cbf83c7eecebb35e

diff --git a/proprietary-files-tee.txt b/proprietary-files-tee.txt
index 46745e73dbebc620ff6654f2778e6a68603de541..8507f725afb6bf1059fd4f3732bd81886ddc3b97 100644 (file)
--- a/proprietary-files-tee.txt
+++ b/proprietary-files-tee.txt
@@ -4,7 +4,7 @@
 ## TEE/Keymaster
 vendor/bin/hw/android.hardware.security.keymint-service.amlogic
 vendor/etc/init/android.hardware.security.keymint-service.amlogic.rc
--vendor/etc/vintf/manifest/android.hardware.security.keymint-service.amlogic.xml
+vendor/etc/vintf/manifest/android.hardware.security.keymint-service.amlogic.xml
 vendor/lib/libtee_load_video_fw.so
 vendor/lib/libteec.so
 vendor/bin/tee-supplicant
@@ -19,7 +19,7 @@ vendor/etc/init/android.hardware.drm@1.4-service.playready.rc
 vendor/etc/drm/playready/bgroupcert.dat
 vendor/etc/drm/playready/zgpriv.dat
 vendor/etc/drm/playready/zgpriv_protected.dat
--vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.playready.xml
+vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.playready.xml
 vendor/lib/libplayready.so
 vendor/lib/libplayreadymediadrmplugin.so
 

diff --git a/proprietary-files.txt b/proprietary-files.txt
index d27bfaef8c4a815bb56d81c6e3f612efd8cc1e75..01b95a35bb5fc8d7f38d77ca716ff6c09e7caadf 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -8,9 +8,9 @@ product/etc/permissions/split-permissions-google.xml
 product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
 product/etc/sysconfig/google.xml:product/etc/sysconfig/google-lineage.xml
 product/etc/sysconfig/google_atv.xml
--product/priv-app/DfuService/DfuService.apk
--product/priv-app/Adt3LauncherCustomization/Adt3LauncherCustomization.apk
--product/priv-app/Adt3SuwCustomization/Adt3SuwCustomization.apk
+product/priv-app/DfuService/DfuService.apk
+product/priv-app/Adt3LauncherCustomization/Adt3LauncherCustomization.apk
+product/priv-app/Adt3SuwCustomization/Adt3SuwCustomization.apk
 system/etc/permissions/privapp-permissions-google.xml
 system_ext/bin/blur_sysprop_notifier
 system_ext/etc/init/blur_sysprop_notifier.rc
@@ -78,9 +78,9 @@ vendor/etc/lowmemorykiller_512M.txt
 vendor/etc/permissions/android.software.cant_save_state.xml
 
 # Composer
--vendor/etc/vintf/manifest/android.hardware.graphics.composer@2.4-service.droidlogic.xml
 vendor/bin/hw/android.hardware.graphics.composer@2.4-service.droidlogic
 vendor/etc/init/android.hardware.graphics.composer@2.4-service.droidlogic.rc
+vendor/etc/vintf/manifest/android.hardware.graphics.composer@2.4-service.droidlogic.xml
 vendor/lib/android.hardware.graphics.composer@2.1-resources-vendor.so
 vendor/lib/android.hardware.graphics.composer@2.2-resources-vendor.so
 vendor/lib/hw/hwcomposer.amlogic.so
@@ -90,8 +90,8 @@ vendor/lib/libvideotunnel.so
 vendor/lib/vendor.amlogic.display.meson_display_ipc@1.0.so
 
 # Droidlogic
--system_ext/priv-app/droidlogic-res/droidlogic-res.apk
--vendor/framework/droidlogic.jar
+system_ext/priv-app/droidlogic-res/droidlogic-res.apk
+vendor/framework/droidlogic.jar
 system_ext/etc/permissions/droidlogic_permissions.xml
 system_ext/lib/libjniuevent.so
 vendor/etc/permissions/droidlogic.software.core.xml
@@ -104,9 +104,9 @@ vendor/lib/libsecmem.so
 vendor/lib/mediacas/libwvmediacas.so
 
 # Dumpstate
--vendor/etc/vintf/manifest/android.hardware.dumpstate@1.1-service.droidlogic.xml
 vendor/bin/hw/android.hardware.dumpstate@1.1-service.droidlogic
 vendor/etc/init/android.hardware.dumpstate@1.1-service.droidlogic.rc
+vendor/etc/vintf/manifest/android.hardware.dumpstate@1.1-service.droidlogic.xml
 
 # DVB
 vendor/lib/libam_adp.so
@@ -127,9 +127,9 @@ vendor/lib/libamgralloc_ext.so
 vendor/lib/hw/hdmi_cec.amlogic.so
 
 # Health
--vendor/etc/vintf/manifest/android.hardware.health@2.1-servcie.droidlogic.xml
 vendor/bin/hw/android.hardware.health@2.1-service.droidlogic
 vendor/etc/init/android.hardware.health@2.1-service.droidlogic.rc
+vendor/etc/vintf/manifest/android.hardware.health@2.1-servcie.droidlogic.xml
 vendor/lib/hw/android.hardware.health@2.0-impl-2.1.droidlogic.so
 
 # Kernel Modules
@@ -207,10 +207,10 @@ vendor/lib/libstagefrighthw.so
 vendor/lib/libthreadworker_alt.so
 
 # Power
--vendor/etc/vintf/manifest/android.hardware.power-service.xml
 vendor/bin/hw/android.hardware.power.aidl-service.droidlogic
 vendor/etc/init/android.hardware.power-service.libperfmgr.rc
 vendor/etc/powerhint.json
+vendor/etc/vintf/manifest/android.hardware.power-service.xml
 vendor/lib/libdisppower.so
 vendor/lib/libperfmgr.so
 
@@ -250,23 +250,23 @@ vendor/lib/vendor.amlogic.hardware.systemcontrol@1.1.so
 vendor/lib/vendor.amlogic.hardware.tvserver@1.0.so
 
 # Thermal
--vendor/etc/vintf/manifest/android.hardware.thermal@2.0-service.droidlogic.xml
 vendor/bin/hw/android.hardware.thermal@2.0-service.droidlogic
 vendor/etc/init/android.hardware.thermal@2.0-service.droidlogic.rc
 vendor/etc/thermal_info_config.json
+vendor/etc/vintf/manifest/android.hardware.thermal@2.0-service.droidlogic.xml
 
 # USB
--vendor/etc/vintf/manifest/android.hardware.usb.gadget@1.2-service.droidlogic.xml
 vendor/bin/hw/android.hardware.usb.gadget@1.2-service.droidlogic
 vendor/etc/init/android.hardware.usb.gadget@1.2-service.droidlogic.rc
+vendor/etc/vintf/manifest/android.hardware.usb.gadget@1.2-service.droidlogic.xml
 
 # Vulkan
 vendor/lib/hw/vulkan.amlogic.so
 
 # Widevine
--vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
 vendor/bin/hw/android.hardware.drm@1.4-service.widevine
 vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
+vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
 vendor/lib/libwvhidl.so
 
 # Wi-Fi