g12: Copy all possible feature permission files directly from fw/native

Change-Id: Iba9a91fcd08868d691c332d50041b473973ecfe5

diff --git a/g12.mk b/g12.mk
index 157209c5ecd6bee21bd734ede43d876aa3a52979..319176b279614618c10eefc86640ee14d2080225 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -182,6 +182,7 @@ PRODUCT_COPY_FILES +=  \
     frameworks/native/data/etc/android.hardware.audio.output.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.output.xml \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \
+    frameworks/native/data/etc/android.hardware.device_unique_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.device_unique_attestation.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.gamepad.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.gamepad.xml \
     frameworks/native/data/etc/android.hardware.hdmi.cec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hdmi.cec.xml \
@@ -196,6 +197,7 @@ PRODUCT_COPY_FILES +=  \
     frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \
     frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \
     frameworks/native/data/etc/android.software.backup.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.backup.xml \
+    frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
     frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml \
     frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml \
     frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9342cdbb1144045c2c34737467dda83d815b466d..a1bc845c646a27a587766c20e5fb880333bdc6f2 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -96,11 +96,7 @@ vendor/etc/lowmemorykiller.txt
 vendor/etc/lowmemorykiller_2G.txt
 vendor/etc/lowmemorykiller_512M.txt
 vendor/etc/mesondisplay.cfg
-vendor/etc/permissions/android.hardware.device_unique_attestation.xml
 vendor/etc/permissions/android.software.cant_save_state.xml
-vendor/etc/permissions/android.software.device_id_attestation.xml
-vendor/etc/permissions/android.software.opengles.deqp.level-2021-03-01.xml
-vendor/etc/permissions/android.software.vulkan.deqp.level-2021-03-01.xml
 vendor/etc/permissions/droidlogic.software.core.xml
 vendor/etc/powerhint.json
 vendor/etc/remote.cfg