commit 8018810a3fa49708fb7aeda01a675ad9e0d0b8c0
author Andreas Gampe <agampe@google.com> Tue Apr 11 15:59:24 2017 -0700
committer Andreas Gampe <agampe@google.com> Tue Apr 11 15:59:24 2017 -0700
tree 9271cf593a20c99952f21c525089fc9e9c6ce201
parent 66e226ac2fb525c7a7cbbb21a9cbbe347f531a1c

ART: Fix GetSystemProperty

Align with VMRuntime.getClassPath to emit "." for an empty path.

Bug: 31455788
Test: manual
Change-Id: Iaf828034d414f45c20960ab6fd0ceb598362c6f1

runtime/openjdkjvmti/ti_properties.cc

diff --git a/runtime/openjdkjvmti/ti_properties.cc b/runtime/openjdkjvmti/ti_properties.cc
index 4f4f013..fd67c59 100644
--- a/runtime/openjdkjvmti/ti_properties.cc
+++ b/runtime/openjdkjvmti/ti_properties.cc
@@ -145,6 +145,11 @@
   return result;
 }
 
+// See dalvik_system_VMRuntime.cpp.
+static const char* DefaultToDot(const std::string& class_path) {
+  return class_path.empty() ? "." : class_path.c_str();
+}
+
 jvmtiError PropertiesUtil::GetSystemProperty(jvmtiEnv* env,
                                              const char* property,
                                              char** value_ptr) {
@@ -168,7 +173,7 @@
   }
 
   if (strcmp(property, kPropertyClassPath) == 0) {
-    return Copy(env, art::Runtime::Current()->GetClassPathString().c_str(), value_ptr);
+    return Copy(env, DefaultToDot(art::Runtime::Current()->GetClassPathString()), value_ptr);
   }
 
   for (size_t i = 0; i != kPropertiesSize; ++i) {