jni: Compile against the NDK.
The most tedious change here is the switch to android-base/logging.h
as the NDK only provides very basic logging functionality via
android/log.h
Test: make
Bug: 139927335
Change-Id: I47811022b371cde81bd08db826b588e5c5c1b81c
diff --git a/jni/Android.bp b/jni/Android.bp
index 58a187d..69fa3a1 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -23,12 +23,19 @@
"FuseDaemon.cpp",
],
+ header_libs: [
+ "libnativehelper_header_only",
+ ],
+
shared_libs: [
"liblog",
- "libnativehelper",
"libfuse",
],
+ static_libs: [
+ "libbase_ndk",
+ ],
+
cflags: [
"-Wall",
"-Werror",
@@ -45,7 +52,6 @@
"-google-runtime-int",
],
-// Uncommenting the line below complains about libfuse not part of the NDK also seems
-// libnativehelper isn't either :(
-// sdk_version: "current",
+ sdk_version: "current",
+ stl: "c++_static",
}