Merge "linker: don't allow libui to SP-HALs and fix warning" into oc-dev (02012596) · Commits · e / os / android_system_core

rootdir/etc/ld.config.txt

+4 −13

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@
		dir.system = /system/bin/
		dir.system = /system/xbin/
		dir.vendor = /vendor/bin/
		dir.legacy = /

		[system]
		additional.namespaces = sphal,vndk,rs
		@@ -53,10 +52,10 @@ namespace.sphal.links = default,vndk

		# WARNING: only NDK libs can be listed here.
		# However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc)
		# are currently using some non-stable libs such as libui.so. We will get back
		# are currently using some non-stable libs such as libbacktrace.so. We will get back
		# to this list once the dependencies are fixed.
		#namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so
		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
		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

		# WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line.
		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

		# WARNING: only NDK libs can be listed here.
		# However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc)
		# are currently using some non-stable libs such as libui.so. We will get back
		# are currently using some non-stable libs such as libacktrace.so. We will get back
		# to this list once the dependencies are fixed.
		#namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so
		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
		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


		[vendor]
		namespace.default.isolated = false
		namespace.default.search.paths = /vendor/${LIB}:/vendor/${LIB}/vndk-sp:/system/${LIB}

		# If a binary does not belong to any of the sections above, it falls back to
		# this section, which is identical to the namespace configuration setup
		# in pre-O.
		[legacy]
		namespace.default.isolated = false
		namespace.default.search.path = /system/${LIB}:/vendor/${LIB}
		namespace.default.asan.search.path = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB}