diff options
author | TreeHugger Robot | 2017-04-17 20:30:48 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2017-04-17 20:30:48 -0500 |
commit | 02012596c151069920ef2ce3df8a071f901f89cf (patch) | |
tree | e3042d5088d7f9065c56adf190a2e17e725cffdb | |
parent | ca243f2fcb80a4f2907d679d125a778f4287f362 (diff) | |
parent | 7b701de5e035a1b382423316938e88e382e5e7ec (diff) | |
download | platform-system-core-02012596c151069920ef2ce3df8a071f901f89cf.tar.gz platform-system-core-02012596c151069920ef2ce3df8a071f901f89cf.tar.xz platform-system-core-02012596c151069920ef2ce3df8a071f901f89cf.zip |
Merge "linker: don't allow libui to SP-HALs and fix warning" into oc-dev
-rw-r--r-- | rootdir/etc/ld.config.txt | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index fbe8b2870..1ec2bc019 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt | |||
@@ -7,7 +7,6 @@ | |||
7 | dir.system = /system/bin/ | 7 | dir.system = /system/bin/ |
8 | dir.system = /system/xbin/ | 8 | dir.system = /system/xbin/ |
9 | dir.vendor = /vendor/bin/ | 9 | dir.vendor = /vendor/bin/ |
10 | dir.legacy = / | ||
11 | 10 | ||
12 | [system] | 11 | [system] |
13 | additional.namespaces = sphal,vndk,rs | 12 | additional.namespaces = sphal,vndk,rs |
@@ -53,10 +52,10 @@ namespace.sphal.links = default,vndk | |||
53 | 52 | ||
54 | # WARNING: only NDK libs can be listed here. | 53 | # WARNING: only NDK libs can be listed here. |
55 | # However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc) | 54 | # However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc) |
56 | # are currently using some non-stable libs such as libui.so. We will get back | 55 | # are currently using some non-stable libs such as libbacktrace.so. We will get back |
57 | # to this list once the dependencies are fixed. | 56 | # to this list once the dependencies are fixed. |
58 | #namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so | 57 | #namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so |
59 | namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libui.so:libbacktrace.so:libGLESv1_CM.so:libGLESv2.so | 58 | namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libbacktrace.so:libGLESv1_CM.so:libGLESv2.so |
60 | 59 | ||
61 | # WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line. | 60 | # WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line. |
62 | namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.base@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidltransport.so:libutils.so:libc++.so | 61 | namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.base@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidltransport.so:libutils.so:libc++.so |
@@ -77,20 +76,12 @@ namespace.vndk.links = default | |||
77 | 76 | ||
78 | # WARNING: only NDK libs can be listed here. | 77 | # WARNING: only NDK libs can be listed here. |
79 | # However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc) | 78 | # However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc) |
80 | # are currently using some non-stable libs such as libui.so. We will get back | 79 | # are currently using some non-stable libs such as libacktrace.so. We will get back |
81 | # to this list once the dependencies are fixed. | 80 | # to this list once the dependencies are fixed. |
82 | #namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so | 81 | #namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so |
83 | namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libui.so:libbacktrace.so | 82 | namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libbacktrace.so |
84 | 83 | ||
85 | 84 | ||
86 | [vendor] | 85 | [vendor] |
87 | namespace.default.isolated = false | 86 | namespace.default.isolated = false |
88 | namespace.default.search.paths = /vendor/${LIB}:/vendor/${LIB}/vndk-sp:/system/${LIB} | 87 | namespace.default.search.paths = /vendor/${LIB}:/vendor/${LIB}/vndk-sp:/system/${LIB} |
89 | |||
90 | # If a binary does not belong to any of the sections above, it falls back to | ||
91 | # this section, which is identical to the namespace configuration setup | ||
92 | # in pre-O. | ||
93 | [legacy] | ||
94 | namespace.default.isolated = false | ||
95 | namespace.default.search.path = /system/${LIB}:/vendor/${LIB} | ||
96 | namespace.default.asan.search.path = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB} | ||