commit 2ab108c5be96768ef094591720596fbc4b7f91f7
author Calin Juravle <calin@google.com> Tue Jan 31 13:53:00 2017 -0800
committer Calin Juravle <calin@google.com> Thu Mar 02 13:08:32 2017 -0800
tree 1d178056dea987227ea56441625740fae23ffe82
parent c9eab382fa4d71ade0077e0547969a47f39ecf05

DEXOPT_FORCE may be passed for primary apk as well.

Remove the check that DEXOPT_FORCE is not set for primary apks. PM will
set it when forcing compilation.

Bug: 32871170
Test: adb shell cmd package compile -f m speed pkgname

(cherry picked from commit 259702336f5826d2a205a2b038cb5a3263fb10e9)

Change-Id: Id34cd1ec929a1e196caf61651a18eb9c275b2590

Merged-In: I690608c48a2c486230ca7d2328ac5c6181427328

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 618884b..aa32d6b 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1422,7 +1422,6 @@
     } else {
         // Currently these flags are only use for secondary dex files.
         // Verify that they are not set for primary apks.
-        CHECK((dexopt_flags & DEXOPT_FORCE) == 0);
         CHECK((dexopt_flags & DEXOPT_STORAGE_CE) == 0);
         CHECK((dexopt_flags & DEXOPT_STORAGE_DE) == 0);
     }