commit a4d8dae190521f970eaef5f32436fa8c3d0799ca
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 02 10:00:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 02 10:00:30 2018 +0000
tree d136e3c2c4f21f3b375a4047d92c52c5b96f1ac8
parent 1636f41a45af1fa3a03c4f695f41efc2dbad2205
parent e87fe0a1c2d48800b70ad33babf5296a5ce589aa

Merge "Installd: Check for dex2oatd before running it"

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 1882771..230853d 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -308,10 +308,11 @@
 
     // If the runtime was requested to use libartd.so, we'll run dex2oatd, otherwise dex2oat.
     const char* dex2oat_bin = "/system/bin/dex2oat";
-    static const char* kDex2oatDebugPath = "/system/bin/dex2oatd";
+    constexpr const char* kDex2oatDebugPath = "/system/bin/dex2oatd";
     if (is_debug_runtime() || (background_job_compile && is_debuggable_build())) {
-        DCHECK(access(kDex2oatDebugPath, X_OK) == 0);
-        dex2oat_bin = kDex2oatDebugPath;
+        if (access(kDex2oatDebugPath, X_OK) == 0) {
+            dex2oat_bin = kDex2oatDebugPath;
+        }
     }
 
     bool generate_minidebug_info = kEnableMinidebugInfo &&