commit bde3b1d47da65b3d8682a717a788f5f3f17d83da
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 01 20:50:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 01 20:50:24 2021 +0000
tree 516843f7f1b45703023d9d6ab9512cef98390cac
parent d0bc2d1c1504afc8156571e98a1dce38b2f19a70
parent 8c0ffc394e170db2c20c17065030a90923d53e66

Don't abort if the oat file doesn't have dex2oat command line key. am: ab2fde3266 am: ac2db2a787 am: 8c0ffc394e

Original change: https://android-review.googlesource.com/c/platform/art/+/1611680

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21c4538bdd757fedcf08d985dfdf99218847ed55

test/common/runtime_state.cc

diff --git a/test/common/runtime_state.cc b/test/common/runtime_state.cc
index ac3cbdd..ecbe546 100644
--- a/test/common/runtime_state.cc
+++ b/test/common/runtime_state.cc
@@ -126,7 +126,10 @@
   CHECK(oat_file != nullptr);
 
   const char* cmd_line = oat_file->GetOatHeader().GetStoreValueByKey(OatHeader::kDex2OatCmdLineKey);
-  CHECK(cmd_line != nullptr);  // Huh? This should not happen.
+  if (cmd_line == nullptr) {
+    // Vdex-only execution, conservatively say no.
+    return JNI_FALSE;
+  }
 
   // Check the backend.
   constexpr const char* kCompilerBackend = "--compiler-backend=";