g12a: Split sm1 to its own tree and drop g12b

* g12b never worked in this tree anyway.
* Start using g12a prefix, as g12b tree may follow.

Change-Id: I6ca77d4605c992d9f381c4968545394c6d197e63

diff --git a/Android.mk b/Android.mk
index 854fd6f568eabf667b1c79fbe69bacd8cabdc67e..ae795f8df04381e4da20ff1a11f4b17eca91fd84 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-ifneq ($(filter g12a g12b sm1,$(TARGET_AMLOGIC_SOC)),)
+ifneq ($(filter g12a,$(TARGET_AMLOGIC_SOC)),)
 ifneq ($(TARGET_USES_P_MODULES),true)
 
 LOCAL_PATH := $(call my-dir)

diff --git a/README.md b/README.md
index 4ee4a6b20b8a17b35e51fbde07a794621e3052a5..4f0927cf9f6883f2d8dd4afce018b96c0c908be1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
 A common tree for the following SoC's:
 * G12A - S905X2/Y2/D2
-* G12B - S922X/A311D
-* SM1 - S905X3/Y3/D3(g)
 
 This tree utilizes a Google-based Android 13 Linux 4.9 kernel.

diff --git a/extract-files.sh b/extract-files.sh
index 36d19570a8d6972460857bdc3d8cb3c44e54abbc..dffabc43e75158e4e0012fa38771244b1a586a38 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -111,14 +111,6 @@ if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/pr
         extract "${MY_DIR}/../../${VENDOR_BRAND}/${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_BRAND}/${DEVICE}/proprietary-firmware.txt" ]; then
         extract_firmware "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-firmware.txt" "${SRC}"
     fi

diff --git a/proprietary-files-g12a.txt b/proprietary-files-g12a.txt
deleted file mode 100644 (file)
index 19d3df7..0000000
--- a/proprietary-files-g12a.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-## 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|8a1895cb74dff9a89d0f5f5fb0799637dc944e50
-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

diff --git a/proprietary-files-sm1.txt b/proprietary-files-sm1.txt
deleted file mode 100644 (file)
index 02716d7..0000000
--- a/proprietary-files-sm1.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-## All blobs from this list, unless pinned and noted as otherwise,
-## are from sabrina_prod_stable-user 12 STTE 240615 007 12033466 release-keys.
-
-## Composer
-vendor/bin/hw/android.hardware.graphics.composer@2.4-service.droidlogic|2e9a56800bc0cbb1e3aa83506c41c7f57193b9fa
-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|03cb651f9ede2c1ff05bdc52fc03ff557e110ed2
-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|ff502c83d0f6ac52bc053784984d493200b7ba30
-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

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 90e6d791e64ba421189e15086f2e16e7c4eb9425..33063356a06fa67e2e99d34b9aa8a9f5508ee428 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -58,6 +58,18 @@ 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
 vendor/bin/hw/android.hardware.dumpstate@1.1-service.droidlogic
 vendor/etc/init/android.hardware.dumpstate@1.1-service.droidlogic.rc
@@ -140,8 +152,18 @@ vendor/etc/seccomp_policy/mediacodec.policy
 vendor/etc/seccomp_policy/mediaextractor.policy
 vendor/etc/seccomp_policy/mediaswcodec.policy
 
-## systemcontrol - Recovery
+## systemcontrol
 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
 vendor/bin/hw/android.hardware.thermal@2.0-service.droidlogic

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index cc5ad187004777f6973f85f7a312e26c74b48bdb..770c898263e3aa7e5e7461315e1ee73f38b0e4dd 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -25,7 +25,7 @@ source "${HELPER}"
 setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true
 
 # Warning headers and guards
-write_headers "g12a g12b sm1" "TARGET_AMLOGIC_SOC"
+write_headers "g12a" "TARGET_AMLOGIC_SOC"
 
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt"
@@ -50,14 +50,6 @@ if [ -s "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-files.txt" ]; the
     # The standard device blobs
     write_makefiles "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-files.txt"
 
-    if [ "${TARGET_SOC}" == "g12a" ]
-    then
-      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-g12a.txt"
-    elif [ "${TARGET_SOC}" == "sm1" ]
-    then
-      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-sm1.txt"
-    fi
-
     if [ -f "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-firmware.txt" ]; then
         append_firmware_calls_to_makefiles "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-firmware.txt"
     fi