g12: Patch libs for missing GraphicBufferMapper symbols

Change-Id: I1e79f01710433ceafb2a4b296a591cf910ee649f

diff --git a/extract-files.sh b/extract-files.sh
index 5adfb668bef124f1c1028013e1910b10b4fdbe81..0b07db0a45502d5b87d5ca9828b693a5edc7e893 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -63,7 +63,7 @@ if [ -z "${SRC}" ]; then
 fi
 
 function blob_fixup() {
-     case "${1}" in
+    case "${1}" in
         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}"
@@ -71,8 +71,11 @@ function blob_fixup() {
         vendor/etc/init/tee-supplicant.rc)
              sed -i 's#/vendor/lib/#/vendor/lib/modules/#g' "${2}"
              ;;
-     esac
- }
+        vendor/lib/hw/camera.amlogic.so|vendor/lib/hw/hwcomposer.amlogic.so|vendor/lib/libOmxCore.so)
+            grep -q "libui_shim.so" "${2}" || "${PATCHELF}" --add-needed "libui_shim.so" "${2}"
+            ;;
+    esac
+}
 
 if [ -z "${ONLY_FIRMWARE}" ] && [ -z "${ONLY_TARGET}" ]; then
     # Initialize the helper for common device

diff --git a/g12.mk b/g12.mk
index 23afa6641bd1ca775771a06b2d55cd4b4cf67a9d..3117ab044a4240e6069f2db771c82993255a59d0 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -179,6 +179,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.usb.gadget@1.2.vendor
 
+## VNDK
+PRODUCT_PACKAGES += \
+    libui_shim.vendor
+
 ## Widevine DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.4.vendor \

diff --git a/proprietary-files-g12a.txt b/proprietary-files-g12a.txt
index 62447e4a27021c886171294bc45ec7320eeca778..19d3df7926137cb86beb9bc24cdc38a6393dd426 100644 (file)
--- a/proprietary-files-g12a.txt
+++ b/proprietary-files-g12a.txt
@@ -7,7 +7,7 @@ vendor/etc/init/android.hardware.graphics.composer@2.4-service.droidlogic.rc|689
 -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/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

diff --git a/proprietary-files-sm1.txt b/proprietary-files-sm1.txt
index 5c65dba7aa75a4b0fb34173929e235cd26ce4fed..5a07d624f4bb01c6faf415282e41c212ec63198d 100644 (file)
--- a/proprietary-files-sm1.txt
+++ b/proprietary-files-sm1.txt
@@ -7,7 +7,7 @@ vendor/etc/init/android.hardware.graphics.composer@2.4-service.droidlogic.rc|689
 -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/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