Merge "Add search paths for asan build" am: 6b6259a083 am: 8e206db77b (51460dba) · Commits · e / os / android_system_core

rootdir/etc/ld.config.txt

+3 −0

rootdir/etc/ld.config.vndk_lite.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -127,6 +127,7 @@ namespace.runtime.isolated = true

	# Keep in sync with ld.config.txt in the com.android.runtime APEX.		# Keep in sync with ld.config.txt in the com.android.runtime APEX.
	namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}		namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
			namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
	namespace.runtime.links = default		namespace.runtime.links = default
	# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library		# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
	# when it exists.		# when it exists.
	@@ -141,6 +142,7 @@ namespace.media.isolated = true
	namespace.media.visible = true		namespace.media.visible = true

	namespace.media.search.paths = /apex/com.android.media/${LIB}		namespace.media.search.paths = /apex/com.android.media/${LIB}
			namespace.media.asan.search.paths = /apex/com.android.media/${LIB}

	namespace.media.links = default		namespace.media.links = default
	namespace.media.link.default.shared_libs = %LLNDK_LIBRARIES%		namespace.media.link.default.shared_libs = %LLNDK_LIBRARIES%
	@@ -158,6 +160,7 @@ namespace.conscrypt.visible = true

	# Keep in sync with ld.config.txt in the com.android.runtime APEX.		# Keep in sync with ld.config.txt in the com.android.runtime APEX.
	namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}		namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
			namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
	namespace.conscrypt.links = default		namespace.conscrypt.links = default
	namespace.conscrypt.link.default.shared_libs = libc.so		namespace.conscrypt.link.default.shared_libs = libc.so
	namespace.conscrypt.link.default.shared_libs += libm.so		namespace.conscrypt.link.default.shared_libs += libm.so

Original line number	Original line	Diff line number	Diff line
	@@ -76,6 +76,7 @@ namespace.runtime.isolated = true
	# Keep in sync with the default namespace in the com.android.runtime APEX		# Keep in sync with the default namespace in the com.android.runtime APEX
	# ld.config.txt.		# ld.config.txt.
	namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}		namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
			namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
	namespace.runtime.links = default		namespace.runtime.links = default
	# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library		# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
	# when it exists.		# when it exists.
	@@ -90,6 +91,7 @@ namespace.media.isolated = true
	namespace.media.visible = true		namespace.media.visible = true

	namespace.media.search.paths = /apex/com.android.media/${LIB}		namespace.media.search.paths = /apex/com.android.media/${LIB}
			namespace.media.asan.search.paths = /apex/com.android.media/${LIB}

	namespace.media.links = default		namespace.media.links = default
	namespace.media.link.default.shared_libs = %LLNDK_LIBRARIES%		namespace.media.link.default.shared_libs = %LLNDK_LIBRARIES%
	@@ -107,6 +109,7 @@ namespace.conscrypt.visible = true

	# Keep in sync with ld.config.txt in the com.android.runtime APEX.		# Keep in sync with ld.config.txt in the com.android.runtime APEX.
	namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}		namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
			namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
	namespace.conscrypt.links = default		namespace.conscrypt.links = default
	namespace.conscrypt.link.default.shared_libs = libc.so		namespace.conscrypt.link.default.shared_libs = libc.so
	namespace.conscrypt.link.default.shared_libs += libm.so		namespace.conscrypt.link.default.shared_libs += libm.so