am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."

* commit 'ed02fbf05c21442f40407bfaefcca35b985ad66a':
  Clean up some unnecessary system_properties cruft.
This commit is contained in:
Elliott Hughes 2014-05-15 00:01:53 +00:00 committed by Android Git Automerger
commit 233bbd9d51
3 changed files with 0 additions and 6 deletions

View file

@ -33,7 +33,6 @@
#include <linux/loop.h> #include <linux/loop.h>
#include <cutils/partition_utils.h> #include <cutils/partition_utils.h>
#include <cutils/android_reboot.h> #include <cutils/android_reboot.h>
#include <sys/system_properties.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>

View file

@ -46,8 +46,6 @@
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#include <termios.h> #include <termios.h>
#include <sys/system_properties.h>
#include "devices.h" #include "devices.h"
#include "init.h" #include "init.h"
#include "log.h" #include "log.h"

View file

@ -3,7 +3,6 @@
#include <cutils/properties.h> #include <cutils/properties.h>
#include <sys/system_properties.h>
#include "dynarray.h" #include "dynarray.h"
static void record_prop(const char* key, const char* name, void* opaque) static void record_prop(const char* key, const char* name, void* opaque)
@ -31,8 +30,6 @@ static void list_properties(void)
strlist_done(list); strlist_done(list);
} }
int __system_property_wait(prop_info *pi);
int getprop_main(int argc, char *argv[]) int getprop_main(int argc, char *argv[])
{ {
int n = 0; int n = 0;