summaryrefslogtreecommitdiffstats
path: root/init/parser.h
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2012-01-06 15:26:30 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-06 15:26:30 -0800
commit829c0b8d9e7ac32141349117ba4364a2f63b22d8 (patch)
treeb5a4bf3a69229bf8ac6681a94ce8165c3cab832e /init/parser.h
parentae8b56c0d17a97aff0b98e6405c7cc9811bbbc3d (diff)
parentebe2cb312d36788fa9956ef6829c6aada495606f (diff)
downloadsystem_core-829c0b8d9e7ac32141349117ba4364a2f63b22d8.zip
system_core-829c0b8d9e7ac32141349117ba4364a2f63b22d8.tar.gz
system_core-829c0b8d9e7ac32141349117ba4364a2f63b22d8.tar.bz2
Merge changes I3c284860,I06dc35ff,Iedda6c90,I933e5bba,I9205d7d7,Iae9ed109
* changes: init: use init's property expansion code for setprop/write init: delay importing files until after parsing the current file init: export all androidboot cmd line values as ro.boot.xx props init: import the hardware specific init file in init.rc init: allow init file imports to use properties in names init: initialize property area early at boot
Diffstat (limited to 'init/parser.h')
-rw-r--r--init/parser.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/parser.h b/init/parser.h
index be93758..0a5802a 100644
--- a/init/parser.h
+++ b/init/parser.h
@@ -30,6 +30,7 @@ struct parse_state
void *context;
void (*parse_line)(struct parse_state *state, int nargs, char **args);
const char *filename;
+ void *priv;
};
int lookup_keyword(const char *s);