Commit 0e3a0efb authored Feb 02, 2020 by Jiyong Park

Statically link to libnativehelper

With ag/10113973, the check for apex_available property became correct.
However, in doing so, a bug in the apex mutator has revealed
(b/148645937). Due to the bug, libnativehelper.so wasn't copied into the
Bluetooth apk, because the lib is supposed  to be served from the ART
apex. However, there is no way for a apk in an APEX to use a native
lib from other APEX. Therefore, libnativehelper.so should actually be
copied into the Bluetooth apk.

Until the bug is fixed, make the linkage to libnativehelper as static so
that it is force included in the containing apk.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 147671264
Test: m
Merged-In: Ia3c27416808bc9c53f4c501710cd4aaadfecbfe1
(cherry picked from commit 23035588)
Change-Id: Ia3c27416808bc9c53f4c501710cd4aaadfecbfe1

parent bfe22a28

android/app/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,11 +18,12 @@ cc_library_shared {
		shared_libs: [
		"libbase",
		"libchrome",
		"libnativehelper",
		"liblog",
		],
		static_libs: [
		"libbluetooth-types",
		// TODO(b/148645937) move this back to shared_libs
		"libnativehelper",
		],
		cflags: [
		"-Wall",