commit a73a0cbcc07640c3656b5648979affd2ff44e4de
author Andreas Gampe <agampe@google.com> Thu Nov 02 18:14:42 2017 -0700
committer Andreas Gampe <agampe@google.com> Fri Nov 03 10:26:00 2017 -0700
tree 0d92a31f6d484ae245cf908260bd7d931814742b
parent d4f0d3a4d2b6fdb74b0647933336d096223e0ce5

Installd: Rename try_debug_for_background

Rename to background_job_compile to signal broader future use.

Test: m
Test: manual test - install
Test: adb shell cmd package bg-dexopt-job
Change-Id: I6bdfa2f591733f3340e2a385cb207ab2839772c5

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index d030aa4..2cce277 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -201,7 +201,7 @@
 static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vdex_fd, int image_fd,
         const char* input_file_name, const char* output_file_name, int swap_fd,
         const char* instruction_set, const char* compiler_filter,
-        bool debuggable, bool post_bootcomplete, bool try_debug_for_background, int profile_fd,
+        bool debuggable, bool post_bootcomplete, bool background_job_compile, int profile_fd,
         const char* class_loader_context) {
     static const unsigned int MAX_INSTRUCTION_SET_LEN = 7;
 
@@ -281,7 +281,7 @@
     // 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";
-    if (is_debug_runtime() || (try_debug_for_background && is_debuggable_build())) {
+    if (is_debug_runtime() || (background_job_compile && is_debuggable_build())) {
         DCHECK(access(kDex2oatDebugPath, X_OK) == 0);
         dex2oat_bin = kDex2oatDebugPath;
     }
@@ -1687,7 +1687,7 @@
     bool boot_complete = (dexopt_flags & DEXOPT_BOOTCOMPLETE) != 0;
     bool profile_guided = (dexopt_flags & DEXOPT_PROFILE_GUIDED) != 0;
     bool is_secondary_dex = (dexopt_flags & DEXOPT_SECONDARY_DEX) != 0;
-    bool try_debug_for_background = (dexopt_flags & DEXOPT_IDLE_BACKGROUND_JOB) != 0;
+    bool background_job_compile = (dexopt_flags & DEXOPT_IDLE_BACKGROUND_JOB) != 0;
 
     // Check if we're dealing with a secondary dex file and if we need to compile it.
     std::string oat_dir_str;
@@ -1783,7 +1783,7 @@
                     compiler_filter,
                     debuggable,
                     boot_complete,
-                    try_debug_for_background,
+                    background_job_compile,
                     reference_profile_fd.get(),
                     class_loader_context);
         _exit(68);   /* only get here on exec failure */