summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2017-01-31 13:53:00 -0800
committerCalin Juravle <calin@google.com>2017-03-02 13:08:32 -0800
commit2ab108c5be96768ef094591720596fbc4b7f91f7 (patch)
tree1d178056dea987227ea56441625740fae23ffe82
parentc9eab382fa4d71ade0077e0547969a47f39ecf05 (diff)
downloadnative-2ab108c5be96768ef094591720596fbc4b7f91f7.tar.gz
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
-rw-r--r--cmds/installd/dexopt.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 618884b330..aa32d6b1e7 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1422,7 +1422,6 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins
} 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);
}