am 740ac6fe: am 2b15f54a: Merge "bionic: libc: Added path to root ramdisk build properties file."

* commit '740ac6fe7358ac73643189bbe1b7a5e7c76142f3':
  bionic: libc: Added path to root ramdisk build properties file.
This commit is contained in:
Andres Morales 2015-01-14 16:05:28 +00:00 committed by Android Git Automerger
commit 6dcbe94239

View File

@ -50,7 +50,7 @@ typedef struct prop_msg prop_msg;
__BEGIN_DECLS
struct prop_msg
struct prop_msg
{
unsigned cmd;
char name[PROP_NAME_MAX];
@ -58,7 +58,7 @@ struct prop_msg
};
#define PROP_MSG_SETPROP 1
/*
** Rules:
**
@ -82,6 +82,7 @@ struct prop_msg
#define PROP_PATH_SYSTEM_BUILD "/system/build.prop"
#define PROP_PATH_SYSTEM_DEFAULT "/system/default.prop"
#define PROP_PATH_VENDOR_BUILD "/vendor/build.prop"
#define PROP_PATH_BOOTIMAGE_BUILD "/build.prop"
#define PROP_PATH_LOCAL_OVERRIDE "/data/local.prop"
#define PROP_PATH_FACTORY "/factory/factory.prop"