Merge "init: wait_for_prop shouldn't run in a subcontext"

am: 6e52973623

Change-Id: I160bedcb91668ccf2b663c36835871d21be2db8b
This commit is contained in:
Tom Cherry 2017-10-19 00:14:21 +00:00 committed by android-build-merger
commit cadc34fd9a

View file

@ -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