diff options
| author | Elliott Hughes <enh@google.com> | 2018-05-29 23:59:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-29 23:59:50 +0000 |
| commit | d580c441ab45a6b7278da003e19af64e9ea2cc71 (patch) | |
| tree | 552abfafdbd95cc05f0e06500409bbf382348258 /init/service.cpp | |
| parent | 420fe5fe9010081cbe61774ac661c0d5e7f09114 (diff) | |
| parent | dc803126283444431c0d06f0386eddada0fe6b77 (diff) | |
| download | system_core-d580c441ab45a6b7278da003e19af64e9ea2cc71.tar.gz system_core-d580c441ab45a6b7278da003e19af64e9ea2cc71.tar.bz2 system_core-d580c441ab45a6b7278da003e19af64e9ea2cc71.zip | |
Merge "libbase: add host properties support."
Diffstat (limited to 'init/service.cpp')
| -rw-r--r-- | init/service.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/service.cpp b/init/service.cpp index 5778a93b0..a6987358f 100644 --- a/init/service.cpp +++ b/init/service.cpp @@ -33,6 +33,7 @@ #include <android-base/file.h> #include <android-base/logging.h> #include <android-base/parseint.h> +#include <android-base/properties.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> #include <android-base/unique_fd.h> @@ -47,8 +48,6 @@ #if defined(__ANDROID__) #include <sys/system_properties.h> -#include <android-base/properties.h> - #include "init.h" #include "property_service.h" #else |