g12a: Decommonize TEE

Change-Id: Ieb16762da85dd729db3f5973e68c171fea26eaa7

diff --git a/extract-files.sh b/extract-files.sh
index dffabc43e75158e4e0012fa38771244b1a586a38..463c49a52674bb7e23715aa412f53b0ce626ff50 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -74,10 +74,6 @@ function blob_fixup() {
              sed -i '/media 0770 media_rw media_rw/d' "${2}"
              sed -i '/setprop ro.crypto.fuse_sdcard true/d' "${2}"
              ;;
-        vendor/etc/init/tee-supplicant.rc)
-            [ "$2" = "" ] && return 0
-             sed -i 's#/vendor/lib/#/vendor/lib/modules/#g' "${2}"
-             ;;
         vendor/lib/hw/camera.amlogic.so|vendor/lib/hw/hwcomposer.amlogic.so|vendor/lib/libOmxCore.so)
             [ "$2" = "" ] && return 0
             grep -q "libui_shim.so" "${2}" || "${PATCHELF}" --add-needed "libui_shim.so" "${2}"
@@ -99,7 +95,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-tee.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 fi
 
 if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-files.txt" ]; then

diff --git a/proprietary-files-tee.txt b/proprietary-files-tee.txt
deleted file mode 100644 (file)
index 8255e1d..0000000
--- a/proprietary-files-tee.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-## All blobs from this list, unless pinned and noted as otherwise,
-## are from adt3-user 13 TTT1.230205.001 9565391 release-keys.
-
-## OEM Lock
-vendor/bin/hw/android.hardware.oemlock@1.0-service.droidlogic
-vendor/etc/init/android.hardware.oemlock@1.0-service.droidlogic.rc
-vendor/etc/vintf/manifest/android.hardware.oemlock@1.0-service.droidlogic.xml
-
-## Playready
-vendor/bin/hw/android.hardware.drm@1.4-service.playready
-vendor/etc/drm/playready/bgroupcert.dat
-vendor/etc/drm/playready/zgpriv.dat
-vendor/etc/drm/playready/zgpriv_protected.dat
-vendor/etc/init/android.hardware.drm@1.4-service.playready.rc
-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.playready.xml
-vendor/lib/libplayready.so
-vendor/lib/libplayreadymediadrmplugin.so
-
-## Netflix - from wade - sti6130d350-user 12 SC 20240419 release-keys
-system/system/etc/sysconfig/netflix.xml|a63698bfa31a9261eb329d0fbbc975faaff37b68
-vendor/bin/hw/android.hardware.drm@1.4-service.netflix|a142b52dc546c591acefa3a1adf19793e0254b71
-vendor/etc/init/android.hardware.drm@1.4-service.netflix.rc|0cdc8bcf31d8300f8f54a9150d103ae6c399dd89
-vendor/etc/permissions/droidlogic.software.netflix.xml|f9798f7873372120d392377a55a5fe61279a98a7
-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.netflix.xml|2ce709a302f21d2cc5532e35d32ce1db03827f56
-vendor/lib/libnetflixplugin.so|660811fd9186157912b715132da15289793ec5b2
-
-## TEE
-vendor/bin/tee-supplicant
-vendor/bin/tee_preload_fw
-vendor/etc/init/android.hardware.security.keymint-service.amlogic.rc
-vendor/etc/init/tee-supplicant.rc
-vendor/etc/init/tee_preload_fw.rc
-vendor/etc/permissions/android.hardware.hardware_keystore.amlogic.xml
-vendor/etc/vintf/manifest/android.hardware.security.keymint-service.amlogic.xml
-vendor/lib/libtee_load_video_fw.so
-vendor/lib/libteec.so
-
-## TEE HDCP - from wade - sti6130d350-user 12 SC 20240419 release-keys
-vendor/bin/tee_hdcp|906be1f4a6cbc7e5d5e6c7f9c75510738c4a3d14
-vendor/bin/tee_key_inject|4048719b00ad7168599616742919c8b8a60897fa
-vendor/etc/init/tee_hdcp.rc|654b0e242fdef6ac9ca03cd0899779355cc29312
-vendor/etc/init/tee_key_inject.rc|f312f1afad60ca32db4bea28b1132c0a93968254

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 770c898263e3aa7e5e7461315e1ee73f38b0e4dd..f03b730a7b4f2a707e9e5622e9a6ff2a3315019e 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -30,13 +30,6 @@ write_headers "g12a" "TARGET_AMLOGIC_SOC"
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt"
 
-# Allow opting out of OP-TEE
-printf '\n%s\n' 'ifneq ($(TARGET_HAS_TEE),false)' >> "$PRODUCTMK"
-
-write_makefiles "${MY_DIR}/proprietary-files-tee.txt"
-
-printf '%s\n' 'endif' >> "$PRODUCTMK"
-
 # Finish
 write_footers