Revert "Write dex files to oat file early."
This reverts commit 625a64aad13905d8a2454bf3cc0e874487b110d5.
Breaks the Mac build:
Undefined symbols for architecture i386:
"_CloseArchive", referenced from:
... in oat_writer.o
ld: symbol(s) not found for architecture i386
Change-Id: I21608bc51437834e1e6abde9bcbe5e7d9998197e
diff --git a/compiler/utils/test_dex_file_builder.h b/compiler/utils/test_dex_file_builder.h
index e57a540..b6a228c 100644
--- a/compiler/utils/test_dex_file_builder.h
+++ b/compiler/utils/test_dex_file_builder.h
@@ -21,7 +21,6 @@
#include <set>
#include <map>
#include <vector>
-#include <zlib.h>
#include "base/bit_utils.h"
#include "base/logging.h"
@@ -162,6 +161,7 @@
uint32_t total_size = data_section_offset + data_section_size;
dex_file_data_.resize(total_size);
+ std::memcpy(&dex_file_data_[0], header_data.data, sizeof(DexFile::Header));
for (const auto& entry : strings_) {
CHECK_LT(entry.first.size(), 128u);
@@ -210,12 +210,7 @@
Write32(raw_offset + 4u, GetStringIdx(entry.first.name));
}
- // Leave signature as zeros.
-
- header->file_size_ = dex_file_data_.size();
- size_t skip = sizeof(header->magic_) + sizeof(header->checksum_);
- header->checksum_ = adler32(0u, dex_file_data_.data() + skip, dex_file_data_.size() - skip);
- std::memcpy(&dex_file_data_[0], header_data.data, sizeof(DexFile::Header));
+ // Leave checksum and signature as zeros.
std::string error_msg;
std::unique_ptr<const DexFile> dex_file(DexFile::Open(