1 files changed, 4 insertions, 0 deletions
diff --git a/dexopt_chroot_setup/dexopt_chroot_setup_test.cc b/dexopt_chroot_setup/dexopt_chroot_setup_test.cc
index 4457de343c..9ee33dfece 100644
--- a/dexopt_chroot_setup/dexopt_chroot_setup_test.cc
+++ b/dexopt_chroot_setup/dexopt_chroot_setup_test.cc
@@ -24,6 +24,7 @@
 #include <string_view>
 
 #include "aidl/com/android/server/art/BnDexoptChrootSetup.h"
+#include "android-base/properties.h"
 #include "android-base/scopeguard.h"
 #include "android/binder_auto_utils.h"
 #include "base/common_art_test.h"
@@ -40,6 +41,7 @@ namespace dexopt_chroot_setup {
 namespace {
 
 using ::android::base::ScopeGuard;
+using ::android::base::WaitForProperty;
 using ::art::tools::CmdlineBuilder;
 
 class DexoptChrootSetupTest : public CommonArtTest {
@@ -72,6 +74,8 @@ class DexoptChrootSetupTest : public CommonArtTest {
       GTEST_SKIP() << "A real Pre-reboot Dexopt is running";
     }
 
+    ASSERT_TRUE(WaitForProperty("dev.bootcomplete", "1", /*timeout=*/std::chrono::minutes(3)));
+
     test_skipped = false;
 
     scratch_dir_ = std::make_unique<ScratchDir>();