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

Commit ae89bfb6 authored Mar 26, 2019 by Pete Bentley Committed by android-build-merger Mar 26, 2019

Merge "Tighten native API surface." am: d2c4eb0d

am: 5f920a0a

Change-Id: I905d0e33099761a637c94b0d998199a71cdeae7c

parents 8f0d3cda 5f920a0a

rootdir/etc/ld.config.legacy.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ namespace.conscrypt.visible = true
		namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.links = runtime,default
		namespace.conscrypt.link.runtime.shared_libs = libjavacore.so
		namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
		namespace.conscrypt.link.default.shared_libs = libc.so
		namespace.conscrypt.link.default.shared_libs += libm.so
		namespace.conscrypt.link.default.shared_libs += libdl.so

rootdir/etc/ld.config.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ namespace.conscrypt.visible = true
		namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.links = runtime,default
		namespace.conscrypt.link.runtime.shared_libs = libjavacore.so
		namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
		namespace.conscrypt.link.default.shared_libs = libc.so
		namespace.conscrypt.link.default.shared_libs += libm.so
		namespace.conscrypt.link.default.shared_libs += libdl.so
		@@ -637,7 +637,7 @@ namespace.conscrypt.visible = true
		namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.links = runtime,default
		namespace.conscrypt.link.runtime.shared_libs = libjavacore.so
		namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
		namespace.conscrypt.link.default.shared_libs = libc.so
		namespace.conscrypt.link.default.shared_libs += libm.so
		namespace.conscrypt.link.default.shared_libs += libdl.so

rootdir/etc/ld.config.vndk_lite.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ namespace.conscrypt.visible = true
		namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.links = runtime,default
		namespace.conscrypt.link.runtime.shared_libs = libjavacore.so
		namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
		namespace.conscrypt.link.default.shared_libs = libc.so
		namespace.conscrypt.link.default.shared_libs += libm.so
		namespace.conscrypt.link.default.shared_libs += libdl.so
		@@ -460,7 +460,7 @@ namespace.conscrypt.visible = true
		namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
		namespace.conscrypt.links = runtime,default
		namespace.conscrypt.link.runtime.shared_libs = libjavacore.so
		namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
		namespace.conscrypt.link.default.shared_libs = libc.so
		namespace.conscrypt.link.default.shared_libs += libm.so
		namespace.conscrypt.link.default.shared_libs += libdl.so