diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-21 00:58:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-21 00:58:42 +0000 |
| commit | 0fac9018f2388f25f5a5778663a14712e75a9903 (patch) | |
| tree | fba35fc0cb951935248dd361893ac82952c8ae09 | |
| parent | 68078ca2b84b4824b4d5fdc3e9d1d4941e205040 (diff) | |
| parent | 9e9970d7ce2ed45d34b8585273b60c6b38783041 (diff) | |
| download | core-0fac9018f2388f25f5a5778663a14712e75a9903.tar.gz | |
Merge cherrypicks of [4392181, 4392182, 4392183, 4392184, 4392201, 4392202] into pi-releaseandroid-cts-9.0_r1android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r5android-9.0.0_r3android-9.0.0_r2android-9.0.0_r1pie-r2-s1-releasepie-r2-release
Change-Id: I82b5577e2ecdbf50a73df940db72964b9c6969af
| -rw-r--r-- | rootdir/Android.mk | 1 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 24 |
2 files changed, 13 insertions, 12 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 80e068af7..5f5c363a7 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -204,6 +204,7 @@ $(2): $(1) $$(hide) sed -i -e 's?%VNDK_CORE_LIBRARIES%?$$(PRIVATE_VNDK_CORE_LIBRARIES)?g' $$@ $$(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $$@ $$(hide) sed -i -e 's?%VNDK_VER%?$$(PRIVATE_VNDK_VERSION)?g' $$@ + $$(hide) sed -i -e 's?%PRODUCT%?$$(TARGET_COPY_OUT_PRODUCT)?g' $$@ llndk_libraries_list := vndksp_libraries_list := diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index a0b1996ad..42dc7abe7 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -7,7 +7,7 @@ # absolute path of an executable is selected. dir.system = /system/bin/ dir.system = /system/xbin/ -dir.system = /product/bin/ +dir.system = /%PRODUCT%/bin/ dir.vendor = /odm/bin/ dir.vendor = /vendor/bin/ @@ -39,7 +39,7 @@ additional.namespaces = sphal,vndk,rs namespace.default.isolated = true namespace.default.search.paths = /system/${LIB} -namespace.default.search.paths += /product/${LIB} +namespace.default.search.paths += /%PRODUCT%/${LIB} # We can't have entire /system/${LIB} as permitted paths because doing so # makes it possible to load libs in /system/${LIB}/vndk* directories by @@ -51,7 +51,7 @@ namespace.default.search.paths += /product/${LIB} namespace.default.permitted.paths = /system/${LIB}/drm namespace.default.permitted.paths += /system/${LIB}/extractors namespace.default.permitted.paths += /system/${LIB}/hw -namespace.default.permitted.paths += /product/${LIB} +namespace.default.permitted.paths += /%PRODUCT%/${LIB} # These are where odex files are located. libart has to be able to dlopen the files namespace.default.permitted.paths += /system/framework namespace.default.permitted.paths += /system/app @@ -63,9 +63,9 @@ namespace.default.permitted.paths += /odm/framework namespace.default.permitted.paths += /odm/app namespace.default.permitted.paths += /odm/priv-app namespace.default.permitted.paths += /oem/app -namespace.default.permitted.paths += /product/framework -namespace.default.permitted.paths += /product/app -namespace.default.permitted.paths += /product/priv-app +namespace.default.permitted.paths += /%PRODUCT%/framework +namespace.default.permitted.paths += /%PRODUCT%/app +namespace.default.permitted.paths += /%PRODUCT%/priv-app namespace.default.permitted.paths += /data namespace.default.permitted.paths += /mnt/expand @@ -88,10 +88,10 @@ namespace.default.asan.permitted.paths += /odm/framework namespace.default.asan.permitted.paths += /odm/app namespace.default.asan.permitted.paths += /odm/priv-app namespace.default.asan.permitted.paths += /oem/app -namespace.default.asan.permitted.paths += /product/${LIB} -namespace.default.asan.permitted.paths += /product/framework -namespace.default.asan.permitted.paths += /product/app -namespace.default.asan.permitted.paths += /product/priv-app +namespace.default.asan.permitted.paths += /%PRODUCT%/${LIB} +namespace.default.asan.permitted.paths += /%PRODUCT%/framework +namespace.default.asan.permitted.paths += /%PRODUCT%/app +namespace.default.asan.permitted.paths += /%PRODUCT%/priv-app namespace.default.asan.permitted.paths += /mnt/expand ############################################################################### @@ -327,7 +327,7 @@ namespace.vndk.link.default.allow_all_shared_libs = true namespace.system.isolated = false namespace.system.search.paths = /system/${LIB} -namespace.system.search.paths += /product/${LIB} +namespace.system.search.paths += /%PRODUCT%/${LIB} namespace.system.asan.search.paths = /data/asan/system/${LIB} namespace.system.asan.search.paths += /system/${LIB} @@ -345,4 +345,4 @@ namespace.system.asan.search.paths += /product/${LIB} [postinstall] namespace.default.isolated = false namespace.default.search.paths = /system/${LIB} -namespace.default.search.paths += /product/${LIB} +namespace.default.search.paths += /%PRODUCT%/${LIB} |