diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-03-28 16:40:41 -0700 |
|---|---|---|
| committer | Keun-young Park <keunyoung@google.com> | 2017-03-29 10:07:54 -0700 |
| commit | ccf23537eeacfa47e5f18dd3b75089886d177c1b (patch) | |
| tree | cadcde5aa295377ca4613fde651a20e2e8bb7a26 /init/util.cpp | |
| parent | ec16825cb8130420dbdd0ca7086f5f1c7ad469a8 (diff) | |
| download | system_core-ccf23537eeacfa47e5f18dd3b75089886d177c1b.tar.gz system_core-ccf23537eeacfa47e5f18dd3b75089886d177c1b.tar.bz2 system_core-ccf23537eeacfa47e5f18dd3b75089886d177c1b.zip | |
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
Diffstat (limited to 'init/util.cpp')
| -rw-r--r-- | init/util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 <android-base/file.h> #include <android-base/logging.h> +#include <android-base/properties.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> #include <android-base/unique_fd.h> @@ -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 << "'"; |