g12: Pull Netflix HAL / DroidLogic apps in

* ATV Netflix depends on L1, so treat is as TEE only.
* DroidLogic apps for better or worse are a huge value
  add, so pull them in device-specific trees.
* Decommonize tvconfig files while we're at it, as
  these devices have wildly varied ODM partitions.
* sabrina needs it's own keymint, use deadpool's
  everywhere else.

Change-Id: Ibf50e4b4e21499efd64cc16c76ead902e69b17fa

diff --git a/extract-files.sh b/extract-files.sh
index d9d5191242ee1bb1b35a6a4ff69d0ba1f073108b..d248e8f851458dbc02475771331c9f1a3e006287 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -64,9 +64,6 @@ fi
 
 function blob_fixup() {
      case "${1}" in
-        odm/etc/tvconfig/pq/pq_default.ini)
-             sed -i 's/pq.AllPQMoudle.en/pq.AllPQModule.en/g' "${2}"
-             ;;
         vendor/etc/init/fs.rc)
              sed -i '/media 0770 media_rw media_rw/d' "${2}"
              sed -i '/setprop ro.crypto.fuse_sdcard true/d' "${2}"

diff --git a/proprietary-files-tee.txt b/proprietary-files-tee.txt
index 260478f71c1a62222662286ac2ea451642d4bb32..71976a07d031354059d8aab048433abd5f9e4551 100644 (file)
--- a/proprietary-files-tee.txt
+++ b/proprietary-files-tee.txt
@@ -6,19 +6,6 @@ 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
 
-## TEE/Keymaster
-vendor/bin/hw/android.hardware.security.keymint-service.amlogic
-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
-
-# Depends on `libtee.so`
 ## Playready
 vendor/bin/hw/android.hardware.drm@1.4-service.playready
 vendor/etc/drm/playready/bgroupcert.dat
@@ -29,8 +16,29 @@ vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.playready.xm
 vendor/lib/libplayready.so
 vendor/lib/libplayreadymediadrmplugin.so
 
-## TEE HDCP - from wade - Dynalink/sti6130d350/sti6130d350:10/QT/20220222:user/release-keys
+## Netflix - from wade - sti6130d350-user 12 SC 20221221 release-keys
+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/lib/libnetflixplugin.so|660811fd9186157912b715132da15289793ec5b2
+vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.netflix.xml|2ce709a302f21d2cc5532e35d32ce1db03827f56
+
+## 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 20221221 release-keys
+vendor/bin/oemcrypto_test_aml|0e4b0e39eb1a568a8bce5b4927c1fac9f03b19ed
 vendor/bin/tee_hdcp|906be1f4a6cbc7e5d5e6c7f9c75510738c4a3d14
 vendor/bin/tee_key_inject|4048719b00ad7168599616742919c8b8a60897fa
+vendor/bin/tee_provision|c4505c7de7be67e3eb42296ac3e0fc84d94229f1
+vendor/bin/videomediaconvertortest|1fdd8cec2674b74e5406300e9d04088bab5be701
 vendor/etc/init/tee_hdcp.rc|654b0e242fdef6ac9ca03cd0899779355cc29312
 vendor/etc/init/tee_key_inject.rc|f312f1afad60ca32db4bea28b1132c0a93968254

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 19f27417dfe52a767580d5f563a06cc80d5bb309..3a1af9d7ebe46a1e5ba744c6fc04948bcaba4adf 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -65,10 +65,6 @@ vendor/lib/libmeson_display_service.so
 vendor/lib/libvideotunnel.so
 vendor/lib/vendor.amlogic.display.meson_display_ipc@1.0.so
 
-# Droidlogic
-vendor/etc/permissions/droidlogic.software.core.xml
-vendor/framework/droidlogic.software.core.jar
-
 # Dumpstate
 vendor/bin/hw/android.hardware.dumpstate@1.1-service.droidlogic
 vendor/etc/init/android.hardware.dumpstate@1.1-service.droidlogic.rc
@@ -128,8 +124,6 @@ vendor/lib/libmediahal_videodec.so
 vendor/lib/hw/memtrack.amlogic.so
 
 # OMX
-odm/lib/libHwAudio_dcvdec.so
-odm/lib/libHwAudio_dtshd.so
 vendor/lib/libOmxAudio.so
 vendor/lib/libOmxBase.so
 vendor/lib/libOmxCore.so
@@ -170,9 +164,6 @@ vendor/etc/seccomp_policy/mediaextractor.policy
 vendor/etc/seccomp_policy/mediaswcodec.policy
 
 # systemcontrol
-odm/etc/firmware/firmware.le
-odm/etc/tvconfig/pq/pq.db
-odm/etc/tvconfig/pq/pq_default.ini
 recovery/root/system/bin/systemcontrol_static|f4ad06b9486cbe9d4a67fa3c2b55a1e821183f8e
 vendor/bin/hdcp_tx22
 vendor/bin/systemcontrol