universal7904: Link hwcomposer against VNDK 32 libutils
Abort message: 'incStrongRequireStrong() called on 0x7bc685a760 which isn't already owned'
Change-Id: I8b014200f5d4ed8fe160f2176218785443b6e9a3
diff --git a/extract-files.sh b/extract-files.sh
index 5899839..0f20e0a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -46,6 +46,9 @@
grep -q libshim_audioparams.so "$2" || "$PATCHELF" --add-needed libshim_audioparams.so "$2"
sed -i 's/str_parms_get_str/str_parms_get_mod/g' "$2"
;;
+ vendor/lib64/hw/hwcomposer.exynos7904.so)
+ "$PATCHELF" --replace-needed "libutils.so" "libutils-v32.so" "$2"
+ ;;
esac
}
diff --git a/universal7904-common.mk b/universal7904-common.mk
index d2fc24e..a794434 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -262,6 +262,10 @@
PRODUCT_PACKAGES += \
android.hardware.vibrator-service.samsung
+# VNDK
+PRODUCT_PACKAGES += \
+ libutils-v32
+
# Wifi
PRODUCT_PACKAGES += \
android.hardware.wifi@1.0-service \
diff --git a/vndk/Android.mk b/vndk/Android.mk
new file mode 100644
index 0000000..3c9a8ac
--- /dev/null
+++ b/vndk/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH := prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libutils-v32
+LOCAL_SRC_FILES := libutils.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TARGET_ARCH := arm64
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_CHECK_ELF_FILES := false
+include $(BUILD_PREBUILT)