diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-10-19 00:14:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 00:14:21 +0000 |
| commit | cadc34fd9ad0c89f949e6ec5d5ebe72f78313d99 (patch) | |
| tree | da53d99e4f508ff5e03b278f17a1b311b9bc8c9f /init/builtins.cpp | |
| parent | f973417005cc4190c5a25c20653035cd4220d6a4 (diff) | |
| parent | 6e52973623623c07d86a03fde0b9e5ff70cd8176 (diff) | |
Merge "init: wait_for_prop shouldn't run in a subcontext"
am: 6e52973623
Change-Id: I160bedcb91668ccf2b663c36835871d21be2db8b
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 9be274b56..950a55155 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -1033,7 +1033,7 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { {"verity_load_state", {0, 0, {false, do_verity_load_state}}}, {"verity_update_state", {0, 0, {false, do_verity_update_state}}}, {"wait", {1, 2, {true, do_wait}}}, - {"wait_for_prop", {2, 2, {true, do_wait_for_prop}}}, + {"wait_for_prop", {2, 2, {false, do_wait_for_prop}}}, {"write", {2, 2, {true, do_write}}}, }; // clang-format on |