g12-common: Remove useless ATV permission files

* split-permissions breaks boot on A15 and seems like it was never needed.
* Rest are in gapps or un-needed.
* DeadpoolService is a no-op on _tab builds, so include it.

Change-Id: I462250b6a75585bfcca23bdeb650fd1e286ae770

diff --git a/extract-files.sh b/extract-files.sh
index b3962d48589eee455df8caa44af7dd6cda618464..36d19570a8d6972460857bdc3d8cb3c44e54abbc 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -99,7 +99,6 @@ if [ -z "${ONLY_FIRMWARE}" ] && [ -z "${ONLY_TARGET}" ]; then
     setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
 
     extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-    extract "${MY_DIR}/proprietary-files-atv.txt" "${SRC}" "${KANG}" --section "${SECTION}"
     extract "${MY_DIR}/proprietary-files-tee.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 fi
 

diff --git a/proprietary-files-atv.txt b/proprietary-files-atv.txt
deleted file mode 100644 (file)
index 6df5601..0000000
--- a/proprietary-files-atv.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-## All blobs from this list, unless pinned and noted as otherwise,
-## are from adt3-user 13 TTT1.230205.001 9565391 release-keys.
-
-## ATV specific
-product/etc/permissions/privapp-permissions-atv-product.xml
-product/etc/permissions/privapp-permissions-google-p.xml
-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/Adt3LauncherCustomization/Adt3LauncherCustomization.apk
-system/etc/permissions/privapp-permissions-google.xml
-system_ext/etc/permissions/privapp-permissions-google-se.xml
-
-## Bluetooth
-product/etc/permissions/privapp-permissions-deadpool.xml
-product/priv-app/DeadpoolService/DeadpoolService.apk

diff --git a/proprietary-files.txt b/proprietary-files.txt
index f02712d98c792d2e11df5f5638a22887e75ca824..90e6d791e64ba421189e15086f2e16e7c4eb9425 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,6 +1,10 @@
 ## All blobs from this list, unless pinned and noted as otherwise,
 ## are from adt3-user 13 TTT1.230205.001 9565391 release-keys.
 
+## ATV specific
+product/etc/permissions/privapp-permissions-atv-product.xml
+product/priv-app/Adt3LauncherCustomization/Adt3LauncherCustomization.apk
+
 ## Audio
 vendor/lib/hw/audio.primary.amlogic.so
 vendor/lib/libAmlAudioOutPort.so
@@ -33,6 +37,8 @@ vendor/lib/soundfx/libvirtualsurround.so
 vendor/lib/soundfx/libvirtualx.so
 
 ## Bluetooth
+product/etc/permissions/privapp-permissions-deadpool.xml
+product/priv-app/DeadpoolService/DeadpoolService.apk
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-droidlogic
 vendor/etc/bluetooth/auto_pairing.conf
 vendor/etc/bluetooth/blacklist.conf

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 961eb12838fc7482574cf82aa1b54f64fea3ddc6..cc5ad187004777f6973f85f7a312e26c74b48bdb 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -30,13 +30,6 @@ write_headers "g12a g12b sm1" "TARGET_AMLOGIC_SOC"
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt"
 
-# Include ATV specific blobs for ATV targets
-printf '\n%s\n' 'ifeq ($(PRODUCT_IS_ATV),true)' >> "$PRODUCTMK"
-
-write_makefiles "${MY_DIR}/proprietary-files-atv.txt"
-
-printf '%s\n' 'endif' >> "$PRODUCTMK"
-
 # Allow opting out of OP-TEE
 printf '\n%s\n' 'ifneq ($(TARGET_HAS_TEE),false)' >> "$PRODUCTMK"