Merge "Statically link to libnativehelper" am: c4140ab6 am: d6d40011

Change-Id: I1ba402dc7a8b6cc3340ed7e6af39d74abadc3c29

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",