commit 1ee6a47a19f10c96d4e6e30b1c0e89d35298fb86
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 04 14:13:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 04 14:13:18 2020 +0000
tree 1435cd433f678b77e63f9e6b135d514bab3f0251
parent 1a73a38d139ce6bd0c96041178bfe6e8e4c54956
parent a7599acf87f51edd09ef22b6c2de4b3cf8657b48

Merge "libnativehelper: restrict libbase dependency"

Android.bp

diff --git a/Android.bp b/Android.bp
index b33edfb..eda2519 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,10 +58,7 @@
         "JniInvocation.cpp",
         "toStringArray.cpp",
     ],
-    shared_libs: [
-        "libbase",
-        "liblog",
-    ],
+    shared_libs: ["liblog"],
     cflags: [
         "-Werror",
         "-fvisibility=protected",
@@ -77,6 +74,7 @@
     },
     target: {
         windows: {
+            shared_libs: ["libbase"],
             enabled: true,
         },
     },

JniInvocation.cpp

diff --git a/JniInvocation.cpp b/JniInvocation.cpp
index dc55d81..8d0c640 100644
--- a/JniInvocation.cpp
+++ b/JniInvocation.cpp
@@ -16,24 +16,23 @@
 
 #include "nativehelper/JniInvocation.h"
 
+#include <string>
+
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <dlfcn.h>
 #endif
-#include <stdlib.h>
-#include <string.h>
-
-#include <cstddef>
 
 #define LOG_TAG "JniInvocation"
 #include <log/log.h>
 
-#ifdef __ANDROID__
+#if defined(__ANDROID__)
 #include <sys/system_properties.h>
+#elif defined(_WIN32)
+#include <android-base/errors.h>
 #endif
 
-#include "android-base/errors.h"
 #include "JniConstants.h"
 
 namespace {