g12-common: Skip ATV specific blobs on non-ATV targets

Change-Id: Ifaec95a99ce028dba5be2547919ff35b93542048

diff --git a/extract-files.sh b/extract-files.sh
index 6f3c78045ce4e27875a3d775c4eadcb86be61b31..789c4cf5867147ae559ddb460d6f453af5391e75 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -78,6 +78,7 @@ if [ -z "${ONLY_TARGET}" ]; then
     setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON}" "${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
new file mode 100644 (file)
index 0000000..81629d9
--- /dev/null
+++ b/proprietary-files-atv.txt
@@ -0,0 +1,21 @@
+### All blobs from this list, unless pinned and noted as otherwise,
+##  are from adt3-user 12 STT1.211025.001.Z4 7928920 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/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
+system_ext/etc/permissions/privapp-permissions-google-se.xml
+
+## Bluetooth
+system_ext/etc/permissions/privapp-permissions-deadpool.xml
+system_ext/priv-app/DeadpoolServiceBtServices/DeadpoolServiceBtServices.apk

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 156381de21873428adf8ff8cae7e4bde9bd149e4..4b0bf7ed7d37b5475674fd6355812cb0fe667ad2 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,23 +1,6 @@
 ### All blobs from this list, unless pinned and noted as otherwise,
 ##  are from adt3-user 12 STT1.211025.001.Z4 7928920 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/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
-system_ext/etc/permissions/privapp-permissions-deadpool.xml
-system_ext/etc/permissions/privapp-permissions-google-se.xml
--system_ext/priv-app/DeadpoolServiceBtServices/DeadpoolServiceBtServices.apk
-
 # Audio
 system_ext/bin/param_set
 vendor/lib/hw/audio.primary.amlogic.so

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 6e16cf041b118a7cfa8d1d91edf418fe120655dc..0a214155ed1a7cc9dfde4bfa9fb0b90221e56dee 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -30,6 +30,13 @@ write_headers "g12a g12b sm1" "TARGET_AMLOGIC_SOC"
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt" true
 
+# 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" true
+
+printf '%s\n' 'endif' >> "$PRODUCTMK"
+
 # Allow opting out of OP-TEE
 printf '\n%s\n' 'ifneq ($(TARGET_HAS_TEE),false)' >> "$PRODUCTMK"