commit d0332e01ac26c2fd0a900de000a55ed5768ff936
author Andreas Gampe <agampe@google.com> Fri Sep 22 19:23:38 2017 -0700
committer Andreas Gampe <agampe@google.com> Wed Oct 25 10:13:59 2017 -0700
tree f65403f1dc6c3ff93c4cae9c1d60851db4e1be88
parent 31275df5ea1b91ed668618d6ec64a76d67cee73c

ART: Do not depend on libnativehelper - toStringArray

Directly implement the single vector->String[] invocation.

Bug: 65522645
Test: m test-art-host
Change-Id: I019f1811d967b049355eef3dcf68835504f86113

runtime/native/dalvik_system_VMRuntime.cc

diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index 4db9feb..c5bc142 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -24,11 +24,6 @@
 #include <limits.h>
 #include "nativehelper/ScopedUtfChars.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
-#include "nativehelper/toStringArray.h"
-#pragma GCC diagnostic pop
-
 #include "android-base/stringprintf.h"
 
 #include "arch/instruction_set.h"
@@ -53,11 +48,13 @@
 #include "mirror/object-inl.h"
 #include "native_util.h"
 #include "nativehelper/jni_macros.h"
+#include "nativehelper/ScopedLocalRef.h"
 #include "runtime.h"
 #include "scoped_fast_native_object_access-inl.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread.h"
 #include "thread_list.h"
+#include "well_known_classes.h"
 
 namespace art {
 
@@ -166,7 +163,27 @@
 }
 
 static jobjectArray VMRuntime_properties(JNIEnv* env, jobject) {
-  return toStringArray(env, Runtime::Current()->GetProperties());
+  DCHECK(WellKnownClasses::java_lang_String != nullptr);
+
+  const std::vector<std::string>& properties = Runtime::Current()->GetProperties();
+  ScopedLocalRef<jobjectArray> ret(env,
+                                   env->NewObjectArray(static_cast<jsize>(properties.size()),
+                                                       WellKnownClasses::java_lang_String,
+                                                       nullptr /* initial element */));
+  if (ret == nullptr) {
+    DCHECK(env->ExceptionCheck());
+    return nullptr;
+  }
+  for (size_t i = 0; i != properties.size(); ++i) {
+    ScopedLocalRef<jstring> str(env, env->NewStringUTF(properties[i].c_str()));
+    if (str == nullptr) {
+      DCHECK(env->ExceptionCheck());
+      return nullptr;
+    }
+    env->SetObjectArrayElement(ret.get(), static_cast<jsize>(i), str.get());
+    DCHECK(!env->ExceptionCheck());
+  }
+  return ret.release();
 }
 
 // This is for backward compatibility with dalvik which returned the