From f30752709e1131ae1a4c16f22cc7a0960c198e77 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 8 Jan 2018 12:41:19 +0000 Subject: Revert "Revert "Don't embed the dex code in the oat file if dex is uncompressed."" Bug: 63920015 Bug: 70854754 Test: oat_writer_test.cc, test.py Revert was due to userdebug/user differences, which is fixed with: https://googleplex-android-review.googlesource.com/#/c/platform/build/+/3434091/ This CL also fixes oatdump when the dex code is not in the .vdex file. This reverts commit e166e67666bf4b23e4ed0a98f5e2bb3cae9cee7d. Change-Id: Iec924be2ff8f03cf2ebe306e7a0018241f33beb0 --- 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 773632cfc6..b51e0debbb 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -107,13 +107,13 @@ class CompilerDriver { ~CompilerDriver(); - // Set dex files that will be stored in the oat file after being compiled. + // Set dex files associated with the oat file being compiled. void SetDexFilesForOatFile(const std::vector& dex_files); // Set dex files classpath. void SetClasspathDexFiles(const std::vector& dex_files); - // Get dex file that will be stored in the oat file after being compiled. + // Get dex files associated with the the oat file being compiled. ArrayRef GetDexFilesForOatFile() const { return ArrayRef(dex_files_for_oat_file_); } @@ -530,7 +530,7 @@ class CompilerDriver { bool support_boot_image_fixup_; - // List of dex files that will be stored in the oat file. + // List of dex files associates with the oat file. std::vector dex_files_for_oat_file_; CompiledMethodStorage compiled_method_storage_; -- cgit v1.2.3-59-g8ed1b