commit 6bc946f3d5e94826037325c943787a4c8e952ede
author Dimitry Ivanov <dimitry@google.com> Wed Jan 06 13:37:17 2016 -0800
committer Dimitry Ivanov <dimitry@google.com> Wed Jan 06 13:38:42 2016 -0800
tree 0519f57f361461e8741dc2bf39fce4ba47643a6b
parent d3014724c9a602dfee9cbcbfe3cb6819d0b33454

Untie libnativehelper from libcutils

Bug: http://b/26421034
Change-Id: I2a54bd87d6e29dfcab81f30863059188c0175b1a

JniInvocation.cpp

diff --git a/JniInvocation.cpp b/JniInvocation.cpp
index 4559b43..a0805ed 100644
--- a/JniInvocation.cpp
+++ b/JniInvocation.cpp
@@ -26,7 +26,7 @@
 #include "cutils/log.h"
 
 #ifdef __ANDROID__
-#include "cutils/properties.h"
+#include <sys/system_properties.h>
 #endif
 
 JniInvocation* JniInvocation::jni_invocation_ = NULL;
@@ -51,7 +51,6 @@
 #ifdef __ANDROID__
 static const char* kLibrarySystemProperty = "persist.sys.dalvik.vm.lib.2";
 static const char* kDebuggableSystemProperty = "ro.debuggable";
-static const char* kDebuggableFallback = "0";  // Not debuggable.
 #endif
 static const char* kLibraryFallback = "libart.so";
 
@@ -61,8 +60,8 @@
 #ifdef __ANDROID__
   const char* default_library;
 
-  char debuggable[PROPERTY_VALUE_MAX];
-  property_get(kDebuggableSystemProperty, debuggable, kDebuggableFallback);
+  char debuggable[PROP_VALUE_MAX];
+  __system_property_get(kDebuggableSystemProperty, debuggable);
 
   if (strcmp(debuggable, "1") != 0) {
     // Not a debuggable build.
@@ -76,8 +75,11 @@
     // Accept the library parameter. For the case it is NULL, load the default
     // library from the system property.
     if (buffer != NULL) {
-      property_get(kLibrarySystemProperty, buffer, kLibraryFallback);
-      default_library = buffer;
+      if (__system_property_get(kLibrarySystemProperty, buffer) > 0) {
+        default_library = buffer;
+      } else {
+        default_library = kLibraryFallback;
+      }
     } else {
       // No buffer given, just use default fallback.
       default_library = kLibraryFallback;
@@ -96,7 +98,7 @@
 
 bool JniInvocation::Init(const char* library) {
 #ifdef __ANDROID__
-  char buffer[PROPERTY_VALUE_MAX];
+  char buffer[PROP_VALUE_MAX];
 #else
   char* buffer = NULL;
 #endif