diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-14 23:59:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-14 23:59:27 +0000 |
| commit | ed02fbf05c21442f40407bfaefcca35b985ad66a (patch) | |
| tree | 93f970b8100b14e572f33ae92cc26a666f1f21ae | |
| parent | f03397fad4430742d85579fc7a80224ed6e6fb2a (diff) | |
| parent | f94853f294059efc49ee5a057833cf8bc2b6c5df (diff) | |
| download | system_core-ed02fbf05c21442f40407bfaefcca35b985ad66a.zip system_core-ed02fbf05c21442f40407bfaefcca35b985ad66a.tar.gz system_core-ed02fbf05c21442f40407bfaefcca35b985ad66a.tar.bz2 | |
Merge "Clean up some unnecessary system_properties cruft."
| -rw-r--r-- | init/builtins.c | 1 | ||||
| -rw-r--r-- | init/init.c | 2 | ||||
| -rw-r--r-- | toolbox/getprop.c | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/init/builtins.c b/init/builtins.c index d973a6b..d9f7bbe 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -33,7 +33,6 @@ #include <linux/loop.h> #include <cutils/partition_utils.h> #include <cutils/android_reboot.h> -#include <sys/system_properties.h> #include <fs_mgr.h> #include <selinux/selinux.h> diff --git a/init/init.c b/init/init.c index fc20198..1538aa6 100644 --- a/init/init.c +++ b/init/init.c @@ -46,8 +46,6 @@ #include <private/android_filesystem_config.h> #include <termios.h> -#include <sys/system_properties.h> - #include "devices.h" #include "init.h" #include "log.h" diff --git a/toolbox/getprop.c b/toolbox/getprop.c index c001fda..7fd694d 100644 --- a/toolbox/getprop.c +++ b/toolbox/getprop.c @@ -3,7 +3,6 @@ #include <cutils/properties.h> -#include <sys/system_properties.h> #include "dynarray.h" static void record_prop(const char* key, const char* name, void* opaque) @@ -31,8 +30,6 @@ static void list_properties(void) strlist_done(list); } -int __system_property_wait(prop_info *pi); - int getprop_main(int argc, char *argv[]) { int n = 0; |