g12: Split g12a/sm1 proprietary files

* Needs its own composer/systemcontrol/keymint.

Change-Id: I5e23feb428ab05fa0a9f46412b7de3a8141c4d47

diff --git a/extract-files.sh b/extract-files.sh
index d248e8f851458dbc02475771331c9f1a3e006287..8e428945f380d89ca1638a42a9c5f81d69e538bd 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -92,6 +92,14 @@ if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../../${VENDOR}/${DEVICE}/propriet
         extract "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
     fi
 
+    if [ "${TARGET_SOC}" == "g12a" ]
+    then
+      extract "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-g12a.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    elif [ "${TARGET_SOC}" == "sm1" ]
+    then
+      extract "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-sm1.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    fi
+
     if [ -f "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt" ]; then
         extract_firmware "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt" "${SRC}"
     fi

diff --git a/proprietary-files-atv.txt b/proprietary-files-atv.txt
index 8712fea4b972bb13c17da1a91a8cecf9d697d5d2..6df560189762b91cca627ce39c9298f3171eda31 100644 (file)
--- a/proprietary-files-atv.txt
+++ b/proprietary-files-atv.txt
@@ -1,7 +1,7 @@
 ## All blobs from this list, unless pinned and noted as otherwise,
 ## are from adt3-user 13 TTT1.230205.001 9565391 release-keys.
 
-# ATV specific
+## 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

diff --git a/proprietary-files-g12a.txt b/proprietary-files-g12a.txt
new file mode 100644 (file)
index 0000000..6e7a4b1
--- /dev/null
+++ b/proprietary-files-g12a.txt
@@ -0,0 +1,29 @@
+## All blobs from this list, unless pinned and noted as otherwise,
+## are from adt3-user 13 TTT1.230205.001 9565391 release-keys.
+
+## Composer
+vendor/bin/hw/android.hardware.graphics.composer@2.4-service.droidlogic|c27947920c256b3296a5cd05861655454c2dcde6
+vendor/etc/init/android.hardware.graphics.composer@2.4-service.droidlogic.rc|689db5f70830b552185429f04b9dba2f2b51bb02
+-vendor/etc/vintf/manifest/android.hardware.graphics.composer@2.4-service.droidlogic.xml|d8c4e120e0b771b05bb38c3cfe91d983e511c7ea
+vendor/lib/android.hardware.graphics.composer@2.1-resources-vendor.so|9160ef2a9c968c69c0a708074c21accf5b33ae34
+vendor/lib/android.hardware.graphics.composer@2.2-resources-vendor.so|c7f3ae1880e279fc639724b8d5bf0bbf8d21bf34
+vendor/lib/hw/hwcomposer.amlogic.so|4afb1464a67c819561cb4b92410a00fa7771402e
+vendor/lib/libmeson_display_adapter_remote.so|c8a8b9735c7ecc0df7c35a2b1a86d5019fe76ad9
+vendor/lib/libmeson_display_service.so|87ab70a6415319d01d3d4425b55528c56aecfb59
+vendor/lib/libvideotunnel.so|c98c4ccdc23269f76366aa11f1b2bb604bd4b148
+vendor/lib/vendor.amlogic.display.meson_display_ipc@1.0.so|3423bf0a114126afb5a41e783e549d785851c700
+
+## systemcontrol - Vendor
+vendor/bin/hdcp_tx22|72a3d43142f9b937aed2aa5d4008a27ce6d353ca
+vendor/bin/systemcontrol|611600c771f6671c7f90c435b316572c1296bb77
+vendor/etc/init/systemcontrol.rc|816b3193c97518903c15efb172a6225177e9bd96
+vendor/lib/libfbc.so|6bf646664d723cab59058cefdeae555caabdae7b
+vendor/lib/libpqcontrol.so|ac03f510d625285cfe55b35671e9b38f59c1ae02
+vendor/lib/libsystemcontrolservice.so|073b914cecfed0266373c853df61e6fe37a0272f
+vendor/lib/vendor.amlogic.hardware.droidvold@1.0.so|6bc377dcf2837382913072f9188f7060ef52df2a
+vendor/lib/vendor.amlogic.hardware.systemcontrol@1.0.so|03a249199deecbd846fd4b779cf6cc50212281eb
+vendor/lib/vendor.amlogic.hardware.systemcontrol@1.1.so|a9d728cbe1361239d8fe9257df8d166a9ed78865
+vendor/lib/vendor.amlogic.hardware.tvserver@1.0.so|d7455026b9e19b6e49e26ce4a9b50c1f905e2e81
+
+## TEE - SOC Specific
+vendor/bin/hw/android.hardware.security.keymint-service.amlogic|0fad4ea718c26abd0d1faad369de76edb3efdfa4

diff --git a/proprietary-files-sm1.txt b/proprietary-files-sm1.txt
new file mode 100644 (file)
index 0000000..caa9593
--- /dev/null
+++ b/proprietary-files-sm1.txt
@@ -0,0 +1,29 @@
+## All blobs from this list, unless pinned and noted as otherwise,
+## are from sabrina_prod_stable-user 12 STTL.231114.004 11218674 release-keys.
+
+## Composer
+vendor/bin/hw/android.hardware.graphics.composer@2.4-service.droidlogic|3d59efbaf93bb6a534738b024ebd2bb4b3d10c65
+vendor/etc/init/android.hardware.graphics.composer@2.4-service.droidlogic.rc|689db5f70830b552185429f04b9dba2f2b51bb02
+-vendor/etc/vintf/manifest/android.hardware.graphics.composer@2.4-service.droidlogic.xml|d8c4e120e0b771b05bb38c3cfe91d983e511c7ea
+vendor/lib/android.hardware.graphics.composer@2.1-resources-vendor.so|62eba15c9159c9f8b3a071a8efc58106b5cc2737
+vendor/lib/android.hardware.graphics.composer@2.2-resources-vendor.so|01fc678f2966779cc3a5c3a7d1d156c8d0a67572
+vendor/lib/hw/hwcomposer.amlogic.so|1822dc9b6ece03c5b6fda4a70fcba8dde0b98812
+vendor/lib/libmeson_display_adapter_remote.so|e0ef6a547fe8f7e53c3a8103b76b6a62848ea38c
+vendor/lib/libmeson_display_service.so|1c6a3a233620847635f788eff203d263c18b4e57
+vendor/lib/libvideotunnel.so|540f2161f82b069f1802413aa5407bd17238b7ef
+vendor/lib/vendor.amlogic.display.meson_display_ipc@1.0.so|662c72f559599d6199db30f3882ce6dcaf81d53e
+
+## systemcontrol - Vendor
+vendor/bin/hdcp_tx22|7db5ef22d8417586f900f0e246f6d22b3e0dc25f
+vendor/bin/systemcontrol|51faae04764b69d7b660f344ba4735a8cd28c277
+vendor/etc/init/systemcontrol.rc|816b3193c97518903c15efb172a6225177e9bd96
+vendor/lib/libfbc.so|c04fd40373778bb1b43f96d2d86f99936dc2026f
+vendor/lib/libpqcontrol.so|a1b752d1fed2cfe2a2df353e1e686434088daa1b
+vendor/lib/libsystemcontrolservice.so|d86b270eecf9029d5ec3c40738c152770b38b054
+vendor/lib/vendor.amlogic.hardware.droidvold@1.0.so|a6318ac0fc68d6c6bccb297b17b7f0dca072b4d2
+vendor/lib/vendor.amlogic.hardware.systemcontrol@1.0.so|c1e371311620444fa46e0d35fdd3f24597dda673
+vendor/lib/vendor.amlogic.hardware.systemcontrol@1.1.so|e7d5001c7f91b0a551ba8c37e15d8f7b6d6e9483
+vendor/lib/vendor.amlogic.hardware.tvserver@1.0.so|a18ec3b774800de0cacee286fa8cd300346e3795
+
+## TEE - SOC Specific
+vendor/bin/hw/android.hardware.security.keymint-service.amlogic|c394595ccf1db8a3e882b431ffabe6eff5ed10c9

diff --git a/proprietary-files-tee.txt b/proprietary-files-tee.txt
index 71976a07d031354059d8aab048433abd5f9e4551..ac5328bc2c51a3b3c56b289d6d8c2a401c88c3e0 100644 (file)
--- a/proprietary-files-tee.txt
+++ b/proprietary-files-tee.txt
@@ -20,8 +20,8 @@ vendor/lib/libplayreadymediadrmplugin.so
 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
+vendor/lib/libnetflixplugin.so|660811fd9186157912b715132da15289793ec5b2
 
 ## TEE
 vendor/bin/tee-supplicant

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3a1af9d7ebe46a1e5ba744c6fc04948bcaba4adf..5722c10a6b69e765f3409705cddd0e4ded2fcb98 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,7 +1,7 @@
 ## All blobs from this list, unless pinned and noted as otherwise,
 ## are from adt3-user 13 TTT1.230205.001 9565391 release-keys.
 
-# Audio
+## Audio
 vendor/lib/hw/audio.primary.amlogic.so
 vendor/lib/libAmlAudioOutPort.so
 vendor/lib/libamadec.so
@@ -21,7 +21,7 @@ vendor/lib/libms12api_v24.so
 vendor/lib/libnano.so
 vendor/lib/libsonic_ext.so
 
-# Audio Effects
+## Audio Effects
 vendor/etc/audio_effects.conf
 vendor/lib/soundfx/libavl.so
 vendor/lib/soundfx/libbalance.so
@@ -33,7 +33,7 @@ vendor/lib/soundfx/libtreblebasswrapper.so
 vendor/lib/soundfx/libvirtualsurround.so
 vendor/lib/soundfx/libvirtualx.so
 
-# Bluetooth
+## Bluetooth
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-droidlogic
 vendor/etc/bluetooth/auto_pairing.conf
 vendor/etc/bluetooth/blacklist.conf
@@ -42,38 +42,26 @@ vendor/etc/bluetooth/bt_vendor_usb.conf
 vendor/etc/init/android.hardware.bluetooth@1.0-service-droidlogic.rc
 vendor/lib/hw/android.hardware.bluetooth@1.0-impl-droidlogic.so
 
-# Camera
+## Camera
 vendor/lib/hw/camera.amlogic.so
 vendor/lib/libispaaa.so
 
-# Common
+## Common
 vendor/bin/ddrtest.sh
 vendor/etc/lowmemorykiller.txt
 vendor/etc/lowmemorykiller_2G.txt
 vendor/etc/lowmemorykiller_512M.txt
 vendor/etc/permissions/android.software.cant_save_state.xml
 
-# Composer
-vendor/bin/hw/android.hardware.graphics.composer@2.4-service.droidlogic
-vendor/etc/init/android.hardware.graphics.composer@2.4-service.droidlogic.rc
-vendor/etc/vintf/manifest/android.hardware.graphics.composer@2.4-service.droidlogic.xml
-vendor/lib/android.hardware.graphics.composer@2.1-resources-vendor.so
-vendor/lib/android.hardware.graphics.composer@2.2-resources-vendor.so
-vendor/lib/hw/hwcomposer.amlogic.so
-vendor/lib/libmeson_display_adapter_remote.so
-vendor/lib/libmeson_display_service.so
-vendor/lib/libvideotunnel.so
-vendor/lib/vendor.amlogic.display.meson_display_ipc@1.0.so
-
-# Dumpstate
+## Dumpstate
 vendor/bin/hw/android.hardware.dumpstate@1.1-service.droidlogic
 vendor/etc/init/android.hardware.dumpstate@1.1-service.droidlogic.rc
 vendor/etc/vintf/manifest/android.hardware.dumpstate@1.1-service.droidlogic.xml
 
-# DVB
+## DVB
 vendor/lib/libam_adp.so
 
-# Graphics
+## Graphics
 vendor/bin/hw/android.hardware.graphics.allocator@4.0-service
 vendor/etc/init/android.hardware.graphics.allocator@4.0-service.rc
 vendor/lib/arm.graphics-V1-ndk_platform.so
@@ -82,22 +70,22 @@ vendor/lib/hw/android.hardware.graphics.allocator@4.0-impl-arm.so
 vendor/lib/hw/android.hardware.graphics.mapper@4.0-impl-arm.so
 vendor/lib/libamgralloc_ext.so
 
-# HDMI CEC
+## HDMI CEC
 vendor/lib/hw/hdmi_cec.amlogic.so
 
-# Health
+## Health
 vendor/bin/hw/android.hardware.health@2.1-service.droidlogic
 vendor/etc/init/android.hardware.health@2.1-service.droidlogic.rc
 vendor/etc/vintf/manifest/android.hardware.health@2.1-servcie.droidlogic.xml
 vendor/lib/hw/android.hardware.health@2.0-impl-2.1.droidlogic.so
 
-# Kernel Modules
+## Kernel Modules
 vendor/lib/modules/amlogic_fbc_lib.ko
 
-# ICU
+## ICU
 vendor/lib/libicuuc_vendor.so
 
-# Init-files
+## Init-files
 vendor/etc/init/bluetooth.rc
 vendor/etc/init/dvb.rc
 vendor/etc/init/fs.rc
@@ -105,14 +93,14 @@ vendor/etc/init/irblaster1.rc
 vendor/etc/init/power.rc
 vendor/etc/init/sysfs_permissions.rc
 
-# Media (Hardware)
+## Media (Hardware)
 vendor/bin/DecInfo_test
 vendor/bin/esplayer
 vendor/lib/firmware/video/h264_enc.bin
 vendor/lib/firmware/video/video_ucode.bin
 vendor/lib/libamavutils.so
 
-# Media
+## Media
 vendor/lib/libmediahal_mediasync.so
 vendor/lib/libmediahal_passthrough.so
 vendor/lib/libmediahal_resman.so
@@ -120,10 +108,10 @@ vendor/lib/libmediahal_tsplayer.so
 vendor/lib/libmediahal_tunnelrenderer.so
 vendor/lib/libmediahal_videodec.so
 
-# Memtrack
+## Memtrack
 vendor/lib/hw/memtrack.amlogic.so
 
-# OMX
+## OMX
 vendor/lib/libOmxAudio.so
 vendor/lib/libOmxBase.so
 vendor/lib/libOmxCore.so
@@ -140,7 +128,7 @@ vendor/lib/libomx_worker_peer_alt.so
 vendor/lib/libstagefrighthw.so
 vendor/lib/libthreadworker_alt.so
 
-# Power
+## Power
 vendor/bin/hw/android.hardware.power.aidl-service.droidlogic
 vendor/etc/init/android.hardware.power-service.libperfmgr.rc
 vendor/etc/powerhint.json
@@ -148,51 +136,41 @@ vendor/etc/vintf/manifest/android.hardware.power-service.xml
 vendor/lib/libdisppower.so
 vendor/lib/libperfmgr.so
 
-# remotecfg
+## remotecfg
 vendor/bin/remotecfg
 vendor/etc/remote.cfg
 vendor/etc/remote.tab1
 vendor/etc/remote.tab2
 vendor/etc/remote.tab3
 
-# screen_source
+## screen_source
 vendor/lib/hw/screen_source.amlogic.so
 
-# seccomp
+## seccomp
 vendor/etc/seccomp_policy/mediacodec.policy
 vendor/etc/seccomp_policy/mediaextractor.policy
 vendor/etc/seccomp_policy/mediaswcodec.policy
 
-# systemcontrol
+## systemcontrol - Recovery
 recovery/root/system/bin/systemcontrol_static|f4ad06b9486cbe9d4a67fa3c2b55a1e821183f8e
-vendor/bin/hdcp_tx22
-vendor/bin/systemcontrol
-vendor/etc/init/systemcontrol.rc
-vendor/lib/libfbc.so
-vendor/lib/libpqcontrol.so
-vendor/lib/libsystemcontrolservice.so
-vendor/lib/vendor.amlogic.hardware.droidvold@1.0.so
-vendor/lib/vendor.amlogic.hardware.systemcontrol@1.0.so
-vendor/lib/vendor.amlogic.hardware.systemcontrol@1.1.so
-vendor/lib/vendor.amlogic.hardware.tvserver@1.0.so
-
-# Thermal
+
+## Thermal
 vendor/bin/hw/android.hardware.thermal@2.0-service.droidlogic
 vendor/etc/init/android.hardware.thermal@2.0-service.droidlogic.rc
 vendor/etc/thermal_info_config.json
 vendor/etc/vintf/manifest/android.hardware.thermal@2.0-service.droidlogic.xml
 
-# USB
+## USB
 vendor/bin/hw/android.hardware.usb.gadget@1.2-service.droidlogic
 vendor/etc/init/android.hardware.usb.gadget@1.2-service.droidlogic.rc
 vendor/etc/vintf/manifest/android.hardware.usb.gadget@1.2-service.droidlogic.xml
 
-# Widevine
+## Widevine
 vendor/bin/hw/android.hardware.drm@1.4-service.widevine
 vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
 vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
 vendor/lib/libwvhidl.so
 
-# Wi-Fi
+## Wi-Fi
 vendor/etc/wifi/p2p_supplicant.conf
 vendor/etc/wifi/p2p_supplicant_overlay.conf

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index f77ff883420fd3d66c80713317d02c240c674c96..1a9a52f1c6afb60950a34585fca5e4310406af67 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -57,6 +57,14 @@ if [ -s "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" ]; then
     # The standard device blobs
     write_makefiles "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" true
 
+    if [ "${TARGET_SOC}" == "g12a" ]
+    then
+      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-g12a.txt" true
+    elif [ "${TARGET_SOC}" == "sm1" ]
+    then
+      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-sm1.txt" true
+    fi
+
     if [ -f "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt" ]; then
         append_firmware_calls_to_makefiles "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt"
     fi