Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc30f4d7 authored May 01, 2019 by Martin Stjernholm Committed by Gerrit Code Review May 01, 2019

Merge "Add linker entries for the new libdexfiled_external.so."

parents e9252285 8a50dad4

rootdir/etc/ld.config.legacy.txt

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -53,11 +53,12 @@ namespace.default.asan.links = runtime,resolv
	# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by		# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
	# libart.		# libart.
	namespace.default.visible = true		namespace.default.visible = true
	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
			namespace.default.link.runtime.shared_libs += libdexfile_external.so
			namespace.default.link.runtime.shared_libs += libdexfiled_external.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	namespace.default.link.runtime.shared_libs += libandroidicu.so

	# TODO(b/122876336): Remove libpac.so once it's migrated to Webview		# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
	namespace.default.link.runtime.shared_libs += libpac.so		namespace.default.link.runtime.shared_libs += libpac.so

rootdir/etc/ld.config.txt

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -132,11 +132,12 @@ namespace.default.links = runtime,resolv
	# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by		# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
	# libart.		# libart.
	namespace.default.visible = true		namespace.default.visible = true
	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
			namespace.default.link.runtime.shared_libs += libdexfile_external.so
			namespace.default.link.runtime.shared_libs += libdexfiled_external.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	namespace.default.link.runtime.shared_libs += libandroidicu.so

	# TODO(b/122876336): Remove libpac.so once it's migrated to Webview		# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
	namespace.default.link.runtime.shared_libs += libpac.so		namespace.default.link.runtime.shared_libs += libpac.so
	@@ -504,6 +505,7 @@ namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB}

	namespace.system.links = runtime		namespace.system.links = runtime
	namespace.system.link.runtime.shared_libs = libdexfile_external.so		namespace.system.link.runtime.shared_libs = libdexfile_external.so
			namespace.system.link.runtime.shared_libs += libdexfiled_external.so
	namespace.system.link.runtime.shared_libs += libnativebridge.so		namespace.system.link.runtime.shared_libs += libnativebridge.so
	namespace.system.link.runtime.shared_libs += libnativehelper.so		namespace.system.link.runtime.shared_libs += libnativehelper.so
	namespace.system.link.runtime.shared_libs += libnativeloader.so		namespace.system.link.runtime.shared_libs += libnativeloader.so
	@@ -579,11 +581,12 @@ namespace.default.asan.search.paths += /vendor/${LIB}
	namespace.default.links = runtime,resolv		namespace.default.links = runtime,resolv
	namespace.default.visible = true		namespace.default.visible = true

	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
			namespace.default.link.runtime.shared_libs += libdexfile_external.so
			namespace.default.link.runtime.shared_libs += libdexfiled_external.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	namespace.default.link.runtime.shared_libs += libandroidicu.so

	# TODO(b/122876336): Remove libpac.so once it's migrated to Webview		# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
	namespace.default.link.runtime.shared_libs += libpac.so		namespace.default.link.runtime.shared_libs += libpac.so

rootdir/etc/ld.config.vndk_lite.txt

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -73,11 +73,12 @@ namespace.default.links = runtime,resolv
	# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by		# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
	# libart.		# libart.
	namespace.default.visible = true		namespace.default.visible = true
	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
			namespace.default.link.runtime.shared_libs += libdexfile_external.so
			namespace.default.link.runtime.shared_libs += libdexfiled_external.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	namespace.default.link.runtime.shared_libs += libandroidicu.so

	# TODO(b/122876336): Remove libpac.so once it's migrated to Webview		# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
	namespace.default.link.runtime.shared_libs += libpac.so		namespace.default.link.runtime.shared_libs += libpac.so
	@@ -357,6 +358,7 @@ namespace.default.asan.search.paths += /system/${LIB}/vndk%VNDK_VER%

	namespace.default.links = runtime		namespace.default.links = runtime
	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libdexfile_external.so
			namespace.default.link.runtime.shared_libs += libdexfiled_external.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	@@ -402,11 +404,12 @@ namespace.default.asan.search.paths += /vendor/${LIB}
	namespace.default.links = runtime,resolv		namespace.default.links = runtime,resolv
	namespace.default.visible = true		namespace.default.visible = true

	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
			namespace.default.link.runtime.shared_libs += libdexfile_external.so
			namespace.default.link.runtime.shared_libs += libdexfiled_external.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	namespace.default.link.runtime.shared_libs += libandroidicu.so

	# TODO(b/122876336): Remove libpac.so once it's migrated to Webview		# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
	namespace.default.link.runtime.shared_libs += libpac.so		namespace.default.link.runtime.shared_libs += libpac.so