commit f049a0b3cff914299d14afa454594f47733b7e53
author Elliott Hughes <enh@google.com> Thu Oct 25 14:28:12 2018 -0700
committer Nicolas Geoffray <ngeoffray@google.com> Fri Oct 26 09:17:13 2018 +0000
tree 71d041cd4c825052de97fec539a6677e77112e7b
parent c2efd4da88c1eeeb51af1ebc4a1321918c3243e5

Remove libcutils property_get dependency.

Bug: 37291459
Test: builds
Change-Id: Ibed8c6c68bafba6950e1bcf46a96d3db50aa1229

runtime/gc/allocation_record.cc

diff --git a/runtime/gc/allocation_record.cc b/runtime/gc/allocation_record.cc
index b9c1dc6..e11fa5c 100644
--- a/runtime/gc/allocation_record.cc
+++ b/runtime/gc/allocation_record.cc
@@ -24,9 +24,7 @@
 #include "object_callbacks.h"
 #include "stack.h"
 
-#ifdef ART_TARGET_ANDROID
-#include "cutils/properties.h"
-#endif
+#include <android-base/properties.h>
 
 namespace art {
 namespace gc {
@@ -45,10 +43,10 @@
 #ifdef ART_TARGET_ANDROID
   // Check whether there's a system property overriding the max number of records.
   const char* propertyName = "dalvik.vm.allocTrackerMax";
-  char allocMaxString[PROPERTY_VALUE_MAX];
-  if (property_get(propertyName, allocMaxString, "") > 0) {
+  std::string allocMaxString = android::base::GetProperty(propertyName, "");
+  if (!allocMaxString.empty()) {
     char* end;
-    size_t value = strtoul(allocMaxString, &end, 10);
+    size_t value = strtoul(allocMaxString.c_str(), &end, 10);
     if (*end != '\0') {
       LOG(ERROR) << "Ignoring  " << propertyName << " '" << allocMaxString
                  << "' --- invalid";
@@ -61,10 +59,10 @@
   }
   // Check whether there's a system property overriding the number of recent records.
   propertyName = "dalvik.vm.recentAllocMax";
-  char recentAllocMaxString[PROPERTY_VALUE_MAX];
-  if (property_get(propertyName, recentAllocMaxString, "") > 0) {
+  std::string recentAllocMaxString = android::base::GetProperty(propertyName, "");
+  if (!recentAllocMaxString.empty()) {
     char* end;
-    size_t value = strtoul(recentAllocMaxString, &end, 10);
+    size_t value = strtoul(recentAllocMaxString.c_str(), &end, 10);
     if (*end != '\0') {
       LOG(ERROR) << "Ignoring  " << propertyName << " '" << recentAllocMaxString
                  << "' --- invalid";
@@ -77,10 +75,10 @@
   }
   // Check whether there's a system property overriding the max depth of stack trace.
   propertyName = "debug.allocTracker.stackDepth";
-  char stackDepthString[PROPERTY_VALUE_MAX];
-  if (property_get(propertyName, stackDepthString, "") > 0) {
+  std::string stackDepthString = android::base::GetProperty(propertyName, "");
+  if (!stackDepthString.empty()) {
     char* end;
-    size_t value = strtoul(stackDepthString, &end, 10);
+    size_t value = strtoul(stackDepthString.c_str(), &end, 10);
     if (*end != '\0') {
       LOG(ERROR) << "Ignoring  " << propertyName << " '" << stackDepthString
                  << "' --- invalid";