From e166e67666bf4b23e4ed0a98f5e2bb3cae9cee7d Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 19 Dec 2017 18:59:29 +0000 Subject: Revert "Don't embed the dex code in the oat file if dex is uncompressed." This reverts commit ae7e83817e546848ef6b2949dd9065b153e14316. Reason for revert: Broken wrt/ preopted apps and stripping Bug: 63920015 Bug: 70777774 Change-Id: I39580684d46fa57bd780d2d8bedd65a47d58cf5e Test: m --- compiler/driver/compiler_driver.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index d1cb175430..0ca3c8f613 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -401,12 +401,6 @@ static optimizer::DexToDexCompilationLevel GetDexToDexCompilationLevel( Thread* self, const CompilerDriver& driver, Handle class_loader, const DexFile& dex_file, const DexFile::ClassDef& class_def) REQUIRES_SHARED(Locks::mutator_lock_) { - // When the dex file is uncompressed in the APK, we do not generate a copy in the .vdex - // file. As a result, dex2oat will map the dex file read-only, and we only need to check - // that to know if we can do quickening. - if (dex_file.GetContainer() != nullptr && dex_file.GetContainer()->IsReadOnly()) { - return optimizer::DexToDexCompilationLevel::kDontDexToDexCompile; - } auto* const runtime = Runtime::Current(); DCHECK(driver.GetCompilerOptions().IsQuickeningCompilationEnabled()); const char* descriptor = dex_file.GetClassDescriptor(class_def); -- cgit v1.2.3-59-g8ed1b