From 2ab108c5be96768ef094591720596fbc4b7f91f7 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Tue, 31 Jan 2017 13:53:00 -0800 Subject: [PATCH] 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 | 1 - 1 file changed, 1 deletion(-) 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); } -- 2.11.0