summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2018-06-20 19:58:42 -0500
committerandroid-build-team Robot2018-06-20 19:58:42 -0500
commit0fac9018f2388f25f5a5778663a14712e75a9903 (patch)
treefba35fc0cb951935248dd361893ac82952c8ae09
parent68078ca2b84b4824b4d5fdc3e9d1d4941e205040 (diff)
parent9e9970d7ce2ed45d34b8585273b60c6b38783041 (diff)
downloadplatform-system-core-android-9.0.0_r2.tar.gz
platform-system-core-android-9.0.0_r2.tar.xz
platform-system-core-android-9.0.0_r2.zip
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_r1
Change-Id: I82b5577e2ecdbf50a73df940db72964b9c6969af
-rw-r--r--rootdir/Android.mk1
-rw-r--r--rootdir/etc/ld.config.txt24
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)
204 $$(hide) sed -i -e 's?%VNDK_CORE_LIBRARIES%?$$(PRIVATE_VNDK_CORE_LIBRARIES)?g' $$@ 204 $$(hide) sed -i -e 's?%VNDK_CORE_LIBRARIES%?$$(PRIVATE_VNDK_CORE_LIBRARIES)?g' $$@
205 $$(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $$@ 205 $$(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $$@
206 $$(hide) sed -i -e 's?%VNDK_VER%?$$(PRIVATE_VNDK_VERSION)?g' $$@ 206 $$(hide) sed -i -e 's?%VNDK_VER%?$$(PRIVATE_VNDK_VERSION)?g' $$@
207 $$(hide) sed -i -e 's?%PRODUCT%?$$(TARGET_COPY_OUT_PRODUCT)?g' $$@
207 208
208llndk_libraries_list := 209llndk_libraries_list :=
209vndksp_libraries_list := 210vndksp_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 @@
7# absolute path of an executable is selected. 7# absolute path of an executable is selected.
8dir.system = /system/bin/ 8dir.system = /system/bin/
9dir.system = /system/xbin/ 9dir.system = /system/xbin/
10dir.system = /product/bin/ 10dir.system = /%PRODUCT%/bin/
11 11
12dir.vendor = /odm/bin/ 12dir.vendor = /odm/bin/
13dir.vendor = /vendor/bin/ 13dir.vendor = /vendor/bin/
@@ -39,7 +39,7 @@ additional.namespaces = sphal,vndk,rs
39namespace.default.isolated = true 39namespace.default.isolated = true
40 40
41namespace.default.search.paths = /system/${LIB} 41namespace.default.search.paths = /system/${LIB}
42namespace.default.search.paths += /product/${LIB} 42namespace.default.search.paths += /%PRODUCT%/${LIB}
43 43
44# We can't have entire /system/${LIB} as permitted paths because doing so 44# We can't have entire /system/${LIB} as permitted paths because doing so
45# makes it possible to load libs in /system/${LIB}/vndk* directories by 45# makes it possible to load libs in /system/${LIB}/vndk* directories by
@@ -51,7 +51,7 @@ namespace.default.search.paths += /product/${LIB}
51namespace.default.permitted.paths = /system/${LIB}/drm 51namespace.default.permitted.paths = /system/${LIB}/drm
52namespace.default.permitted.paths += /system/${LIB}/extractors 52namespace.default.permitted.paths += /system/${LIB}/extractors
53namespace.default.permitted.paths += /system/${LIB}/hw 53namespace.default.permitted.paths += /system/${LIB}/hw
54namespace.default.permitted.paths += /product/${LIB} 54namespace.default.permitted.paths += /%PRODUCT%/${LIB}
55# These are where odex files are located. libart has to be able to dlopen the files 55# These are where odex files are located. libart has to be able to dlopen the files
56namespace.default.permitted.paths += /system/framework 56namespace.default.permitted.paths += /system/framework
57namespace.default.permitted.paths += /system/app 57namespace.default.permitted.paths += /system/app
@@ -63,9 +63,9 @@ namespace.default.permitted.paths += /odm/framework
63namespace.default.permitted.paths += /odm/app 63namespace.default.permitted.paths += /odm/app
64namespace.default.permitted.paths += /odm/priv-app 64namespace.default.permitted.paths += /odm/priv-app
65namespace.default.permitted.paths += /oem/app 65namespace.default.permitted.paths += /oem/app
66namespace.default.permitted.paths += /product/framework 66namespace.default.permitted.paths += /%PRODUCT%/framework
67namespace.default.permitted.paths += /product/app 67namespace.default.permitted.paths += /%PRODUCT%/app
68namespace.default.permitted.paths += /product/priv-app 68namespace.default.permitted.paths += /%PRODUCT%/priv-app
69namespace.default.permitted.paths += /data 69namespace.default.permitted.paths += /data
70namespace.default.permitted.paths += /mnt/expand 70namespace.default.permitted.paths += /mnt/expand
71 71
@@ -88,10 +88,10 @@ namespace.default.asan.permitted.paths += /odm/framework
88namespace.default.asan.permitted.paths += /odm/app 88namespace.default.asan.permitted.paths += /odm/app
89namespace.default.asan.permitted.paths += /odm/priv-app 89namespace.default.asan.permitted.paths += /odm/priv-app
90namespace.default.asan.permitted.paths += /oem/app 90namespace.default.asan.permitted.paths += /oem/app
91namespace.default.asan.permitted.paths += /product/${LIB} 91namespace.default.asan.permitted.paths += /%PRODUCT%/${LIB}
92namespace.default.asan.permitted.paths += /product/framework 92namespace.default.asan.permitted.paths += /%PRODUCT%/framework
93namespace.default.asan.permitted.paths += /product/app 93namespace.default.asan.permitted.paths += /%PRODUCT%/app
94namespace.default.asan.permitted.paths += /product/priv-app 94namespace.default.asan.permitted.paths += /%PRODUCT%/priv-app
95namespace.default.asan.permitted.paths += /mnt/expand 95namespace.default.asan.permitted.paths += /mnt/expand
96 96
97############################################################################### 97###############################################################################
@@ -327,7 +327,7 @@ namespace.vndk.link.default.allow_all_shared_libs = true
327namespace.system.isolated = false 327namespace.system.isolated = false
328 328
329namespace.system.search.paths = /system/${LIB} 329namespace.system.search.paths = /system/${LIB}
330namespace.system.search.paths += /product/${LIB} 330namespace.system.search.paths += /%PRODUCT%/${LIB}
331 331
332namespace.system.asan.search.paths = /data/asan/system/${LIB} 332namespace.system.asan.search.paths = /data/asan/system/${LIB}
333namespace.system.asan.search.paths += /system/${LIB} 333namespace.system.asan.search.paths += /system/${LIB}
@@ -345,4 +345,4 @@ namespace.system.asan.search.paths += /product/${LIB}
345[postinstall] 345[postinstall]
346namespace.default.isolated = false 346namespace.default.isolated = false
347namespace.default.search.paths = /system/${LIB} 347namespace.default.search.paths = /system/${LIB}
348namespace.default.search.paths += /product/${LIB} 348namespace.default.search.paths += /%PRODUCT%/${LIB}