commit 64f3d11dd773b89b93de3764f55c6a0a6328f4ff
author Calin Juravle <calin@google.com> Fri Mar 03 00:30:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 03 00:30:20 2017 +0000
tree c511e87713cde62e851a321b6afd32a607e90a87
parent c8bf9b2ff0a1315301f92a5963b148fc61557142
parent b77cb8b653d2b2efc7a18c6862f6fb3f32afc311

DEXOPT_FORCE may be passed for primary apk as well. am: 2ab108c5be
am: b77cb8b653

Change-Id: I83f8e20747b6f001a7ec44a1f708d71811a81f51

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);
     }