Use libnativehelper in preference to libnativehelper_compat_libc++
The former is now available as a public library and already loaded in
the process when jni libraries are loaded.
Bug: 151443957
Test: m & boot
Change-Id: I7ca6e517ca2966afbdae056c4bcf4b2380885860
diff --git a/NativeCode.bp b/NativeCode.bp
index 7b86fef..eca75b3 100644
--- a/NativeCode.bp
+++ b/NativeCode.bp
@@ -212,15 +212,8 @@
"libicui18n",
"libicuuc",
"liblog",
+ "libnativehelper",
],
- target: {
- android: {
- shared_libs: ["libnativehelper_compat_libc++"],
- },
- host: {
- shared_libs: ["libnativehelper"],
- },
- },
cflags: [
// -DANDROID_LINK_SHARED_ICU4C to enable access to the full ICU4C.