Merge "Apply the standard system linker config to all of /data." am: 60de348654 am: 0ec4836b71 (d2c8014b) · Commits · e / os / android_system_core

rootdir/etc/ld.config.legacy.txt

+4 −5

Original line number	Diff line number	Diff line
		@@ -11,14 +11,13 @@ dir.legacy = /vendor
		dir.legacy = /odm
		dir.legacy = /sbin

		dir.legacy = /data/nativetest
		dir.legacy = /data/nativetest64
		dir.legacy = /data/benchmarktest
		dir.legacy = /data/benchmarktest64

		# Except for /postinstall, where only /system and /product are searched
		dir.postinstall = /postinstall

		# Fallback entry to provide APEX namespace lookups for binaries anywhere else.
		# This must be last.
		dir.legacy = /data

		[legacy]
		namespace.default.isolated = false

+4 −5

Original line number	Diff line number	Diff line
		@@ -27,13 +27,12 @@ dir.unrestricted = /data/nativetest64/unrestricted
		# necessary) the unrestricted subdirs above. Then clean this up.
		dir.unrestricted = /data/local/tmp

		dir.system = /data/nativetest
		dir.system = /data/nativetest64
		dir.system = /data/benchmarktest
		dir.system = /data/benchmarktest64

		dir.postinstall = /postinstall

		# Fallback entry to provide APEX namespace lookups for binaries anywhere else.
		# This must be last.
		dir.system = /data

		[system]
		additional.namespaces = runtime,conscrypt,media,resolv,sphal,vndk,rs

+4 −5

Original line number	Diff line number	Diff line
		@@ -27,13 +27,12 @@ dir.unrestricted = /data/nativetest64/unrestricted
		# necessary) the unrestricted subdirs above. Then clean this up.
		dir.unrestricted = /data/local/tmp

		dir.system = /data/nativetest
		dir.system = /data/nativetest64
		dir.system = /data/benchmarktest
		dir.system = /data/benchmarktest64

		dir.postinstall = /postinstall

		# Fallback entry to provide APEX namespace lookups for binaries anywhere else.
		# This must be last.
		dir.system = /data

		[system]
		additional.namespaces = runtime,conscrypt,media,resolv,sphal,vndk,rs