Remove dependency on libcutils
Use liblog for liblog (instead of libcutils)
Replace calls to property_get with libbase
GetProperty()
Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Test: make test-art-target -j4
Change-Id: I2a2913af8f521131558e9dd672d3973a64a410d3
diff --git a/runtime/arch/instruction_set_features_test.cc b/runtime/arch/instruction_set_features_test.cc
index 7bbc709..0b8e531 100644
--- a/runtime/arch/instruction_set_features_test.cc
+++ b/runtime/arch/instruction_set_features_test.cc
@@ -19,7 +19,7 @@
#include <gtest/gtest.h>
#ifdef ART_TARGET_ANDROID
-#include "cutils/properties.h"
+#include "android-base/properties.h"
#endif
#include "base/logging.h"
@@ -40,8 +40,8 @@
// Read the variant property.
std::string key = StringPrintf("dalvik.vm.isa.%s.variant", GetInstructionSetString(kRuntimeISA));
- char dex2oat_isa_variant[PROPERTY_VALUE_MAX];
- if (property_get(key.c_str(), dex2oat_isa_variant, nullptr) > 0) {
+ std::string dex2oat_isa_variant = android::base::GetProperty(key, "");
+ if (!dex2oat_isa_variant.empty()) {
// Use features from property to build InstructionSetFeatures and check against build's
// features.
std::string error_msg;
@@ -68,13 +68,13 @@
// Read the variant property.
std::string variant_key = StringPrintf("dalvik.vm.isa.%s.variant",
GetInstructionSetString(kRuntimeISA));
- char dex2oat_isa_variant[PROPERTY_VALUE_MAX];
- if (property_get(variant_key.c_str(), dex2oat_isa_variant, nullptr) > 0) {
+ std::string dex2oat_isa_variant = android::base::GetProperty(variant_key, "");
+ if (!dex2oat_isa_variant.empty()) {
// Read the features property.
std::string features_key = StringPrintf("dalvik.vm.isa.%s.features",
GetInstructionSetString(kRuntimeISA));
- char dex2oat_isa_features[PROPERTY_VALUE_MAX];
- if (property_get(features_key.c_str(), dex2oat_isa_features, nullptr) > 0) {
+ std::string dex2oat_isa_features = android::base::GetProperty(features_key, "");
+ if (!dex2oat_isa_features.empty()) {
// Use features from property to build InstructionSetFeatures and check against build's
// features.
std::string error_msg;
diff --git a/test/Android.bp b/test/Android.bp
index 72dcbba..628f377 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -110,7 +110,7 @@
"-Wl,-u,Java_MyClassNatives_sbar",
],
shared_libs: [
- "libcutils",
+ "liblog",
"libdl",
"libz",
],
