commit 1dc3dfaf8dbb5160062aaa1b0129ef9fe628a70d
author Mathieu Chartier <mathieuc@google.com> Mon Mar 12 17:55:06 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Apr 03 15:38:43 2018 -0700
tree 5af4519a0bfa1cbf414614608ab065a37dd2b921
parent 469e9925b4dc8abf7811b7d3390216803c6f123f

Add flag for controling app image generation

So that package manager service can control this.

Bug: 72696798
Test: manual

(cherry picked from commit ad45a1b89bc3b6ec84ac32c4200be3d3c1d056fa)

Merged-In: I15fa74aff24ef14d22541117408840f80b7d300f
Change-Id: If8886187a67f392dd83061b9f44fae8d3bac22be

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index d06b4f6..4c75eb5 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -82,8 +82,9 @@
 static_assert(DEXOPT_ENABLE_HIDDEN_API_CHECKS == 1 << 10,
         "DEXOPT_ENABLE_HIDDEN_API_CHECKS unexpected");
 static_assert(DEXOPT_GENERATE_COMPACT_DEX == 1 << 11, "DEXOPT_GENERATE_COMPACT_DEX unexpected");
+static_assert(DEXOPT_GENERATE_APP_IMAGE == 1 << 12, "DEXOPT_GENERATE_APP_IMAGE unexpected");
 
-static_assert(DEXOPT_MASK           == (0xdfe | DEXOPT_IDLE_BACKGROUND_JOB),
+static_assert(DEXOPT_MASK           == (0x1dfe | DEXOPT_IDLE_BACKGROUND_JOB),
               "DEXOPT_MASK unexpected.");