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

Commit b78de852 authored Jun 07, 2019 by Treehugger Robot Committed by Gerrit Code Review Jun 07, 2019

Merge "Update TODOs for ICU library links."

parents 2ba59c5b 0d28abc5

rootdir/etc/ld.config.legacy.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,7 @@ namespace.default.asan.links = runtime,resolv
	namespace.default.link.runtime.shared_libs = libandroidicu.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
	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 += libdexfiled_external.so
	# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466		# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat.
	namespace.default.link.runtime.shared_libs += libicui18n.so		namespace.default.link.runtime.shared_libs += libicui18n.so
	namespace.default.link.runtime.shared_libs += libicuuc.so		namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so

rootdir/etc/ld.config.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -135,7 +135,7 @@ namespace.default.links = runtime,resolv
	namespace.default.link.runtime.shared_libs = libandroidicu.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
	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 += libdexfiled_external.so
	# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466		# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat.
	namespace.default.link.runtime.shared_libs += libicui18n.so		namespace.default.link.runtime.shared_libs += libicui18n.so
	namespace.default.link.runtime.shared_libs += libicuuc.so		namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	@@ -522,7 +522,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 += libdexfiled_external.so
	# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466		# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat.
	namespace.system.link.runtime.shared_libs += libicui18n.so		namespace.system.link.runtime.shared_libs += libicui18n.so
	namespace.system.link.runtime.shared_libs += libicuuc.so		namespace.system.link.runtime.shared_libs += libicuuc.so
	namespace.system.link.runtime.shared_libs += libnativebridge.so		namespace.system.link.runtime.shared_libs += libnativebridge.so
	@@ -607,7 +607,7 @@ namespace.default.links = runtime,resolv
	namespace.default.link.runtime.shared_libs = libandroidicu.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
	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 += libdexfiled_external.so
	# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466		# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat.
	namespace.default.link.runtime.shared_libs += libicui18n.so		namespace.default.link.runtime.shared_libs += libicui18n.so
	namespace.default.link.runtime.shared_libs += libicuuc.so		namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so

rootdir/etc/ld.config.vndk_lite.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ namespace.default.links = runtime,resolv
	namespace.default.link.runtime.shared_libs = libandroidicu.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
	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 += libdexfiled_external.so
	# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466		# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat.
	namespace.default.link.runtime.shared_libs += libicui18n.so		namespace.default.link.runtime.shared_libs += libicui18n.so
	namespace.default.link.runtime.shared_libs += libicuuc.so		namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	@@ -366,7 +366,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 += libdexfiled_external.so
	# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466		# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat.
	namespace.default.link.runtime.shared_libs += libicui18n.so		namespace.default.link.runtime.shared_libs += libicui18n.so
	namespace.default.link.runtime.shared_libs += libicuuc.so		namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	@@ -419,7 +419,7 @@ namespace.default.links = runtime,resolv
	namespace.default.link.runtime.shared_libs = libandroidicu.so		namespace.default.link.runtime.shared_libs = libandroidicu.so
	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 += libdexfiled_external.so
	# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466		# TODO(b/120786417 or b/134659294): libicuuc.so and libicui18n.so are kept for app compat.
	namespace.default.link.runtime.shared_libs += libicui18n.so		namespace.default.link.runtime.shared_libs += libicui18n.so
	namespace.default.link.runtime.shared_libs += libicuuc.so		namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so