From ccf23537eeacfa47e5f18dd3b75089886d177c1b Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Tue, 28 Mar 2017 16:40:41 -0700 Subject: init: replace property_get with its android::base equivalent Slowly try to decouple property_service.cpp from the rest of init. Test: Boot bullhead Change-Id: I267ae0b057bca0bf657b97cb8bfbb18199282729 --- init/util.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'init/util.cpp') diff --git a/init/util.cpp b/init/util.cpp index 0ba98003f..8a1993987 100644 --- a/init/util.cpp +++ b/init/util.cpp @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -48,7 +49,6 @@ #include "init.h" #include "log.h" -#include "property_service.h" #include "reboot.h" #include "util.h" @@ -395,7 +395,7 @@ bool expand_props(const std::string& src, std::string* dst) { return false; } - std::string prop_val = property_get(prop_name.c_str()); + std::string prop_val = android::base::GetProperty(prop_name, ""); if (prop_val.empty()) { if (def_val.empty()) { LOG(ERROR) << "property '" << prop_name << "' doesn't exist while expanding '" << src << "'"; -- cgit v1.2.3