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.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index eab15b9f49..d2141e8bc7 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -102,13 +102,13 @@ class CompilerDriver { ~CompilerDriver(); - // Set dex files associated with the oat file being compiled. + // Set dex files that will be stored in the oat file after being compiled. void SetDexFilesForOatFile(const std::vector& dex_files); // Set dex files classpath. void SetClasspathDexFiles(const std::vector& dex_files); - // Get dex files associated with the the oat file being compiled. + // Get dex file that will be stored in the oat file after being compiled. ArrayRef GetDexFilesForOatFile() const { return ArrayRef(dex_files_for_oat_file_); } @@ -528,7 +528,7 @@ class CompilerDriver { bool support_boot_image_fixup_; - // List of dex files associates with the oat file. + // List of dex files that will be stored in the oat file. std::vector dex_files_for_oat_file_; CompiledMethodStorage compiled_method_storage_; -- cgit v1.2.3-59-g8ed1b