OSDN Git Service

DEXOPT_FORCE may be passed for primary apk as well.
authorCalin Juravle <calin@google.com>
Tue, 31 Jan 2017 21:53:00 +0000 (13:53 -0800)
committerCalin Juravle <calin@google.com>
Thu, 2 Mar 2017 21:08:32 +0000 (13:08 -0800)
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

index 618884b..aa32d6b 100644 (file)
@@ -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);
     }