From 7b43d9eb6f1904cc77b9e1327070e2a20e2fb84d Mon Sep 17 00:00:00 2001 From: SamarV-121 Date: Mon, 5 Oct 2020 05:10:30 +0000 Subject: [PATCH] universal7885: Fulfil dependencies of camera HAL [1/2] * Expose libgui.so to all vendor modules * Import libcamera.client.so to prebuilt vndk-29 Signed-off-by: SamarV-121 Change-Id: Ia30c8f7cb8b420f1b19b6c973f047aa55b06b930 --- proprietary-files.txt | 2 ++ rootdir/Android.mk | 8 ++++++++ rootdir/bin/sys.sh | 3 +++ universal7904-common.mk | 3 ++- 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 rootdir/bin/sys.sh diff --git a/proprietary-files.txt b/proprietary-files.txt index e69de29..8b6879a 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -0,0 +1,2 @@ +# Camera +lib/libcamera_client.so:system_ext/apex/com.android.vndk.v29/lib/libcamera_client.so diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e2c4b37..625e217 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -23,3 +23,11 @@ LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.enableswap LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := sys.sh +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := bin/sys.sh +LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) +include $(BUILD_PREBUILT) diff --git a/rootdir/bin/sys.sh b/rootdir/bin/sys.sh new file mode 100644 index 0000000..5cd0912 --- /dev/null +++ b/rootdir/bin/sys.sh @@ -0,0 +1,3 @@ +#!/sbin/sh +echo "$(grep -v libgui.so system/system/system_ext/apex/com.android.vndk.v29/etc/vndkprivate.libraries.29.txt)" > system/system/system_ext/apex/com.android.vndk.v29/etc/vndkprivate.libraries.29.txt +echo libcamera_client.so >> system/system/system_ext/apex/com.android.vndk.v29/etc/vndkcore.libraries.29.txt diff --git a/universal7904-common.mk b/universal7904-common.mk index e9fada5..cdf4c16 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -21,7 +21,8 @@ TARGET_SCREEN_WIDTH := 1080 PRODUCT_PACKAGES += \ init.universal7904.rc \ init.usb_accessory.rc \ - fstab.enableswap + fstab.enableswap \ + sys.sh # NFC PRODUCT_PACKAGES += \