Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c633e6f authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '233bbd9d':
  Clean up some unnecessary system_properties cruft.
parents 8f1c82c6 233bbd9d

init/builtins.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -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>

init/init.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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"

toolbox/getprop.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -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;