Implement system namespace for vendor process
For vendor process default namespace searches as following order:
1. /vendor/lib/(hw|egl), /vendor/lib: Vendor libs + VNDK-vnd-ext
2. /system/lib/vndk-$(ver): VNDK libs
3. /vendor/lib/vndk-sp-$(ver): VNDK-SP-vnd-ext
4. /system/lib/vndk-sp-$(ver): VNDK-SP
and searches system namespace (/system/lib) only for LL-NDK libs.
This configuarion is used only with BOARD_VNDK_VERSION is defined.
Bug: 37192038
Test: build with 'BOARD_VNDK_VERSION=current' and boot
Merged-In: If9778b9266a084846ba8fe73e6bff25828359d33
Change-Id: If9778b9266a084846ba8fe73e6bff25828359d33
(cherry picked from commit 24c29f1be49f47a6d8a098a10591d9c3f0d4e8ee)
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index cebcb7f..ae75ae2 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -180,7 +180,15 @@
LOCAL_MODULE := ld.config.txt
ifeq ($(PRODUCT_FULL_TREBLE)|$(SANITIZE_TARGET),true|)
+ifdef BOARD_VNDK_VERSION
+ ifeq ($(BOARD_VNDK_RUNTIME_DISABLE),true)
+ LOCAL_SRC_FILES := etc/ld.config.txt
+ else
+ LOCAL_SRC_FILES := etc/ld.config.vndk.txt
+ endif
+else
LOCAL_SRC_FILES := etc/ld.config.txt
+endif
else
LOCAL_SRC_FILES := etc/ld.config.legacy.txt
endif