diff options
| author | 2016-01-23 14:16:58 +0000 | |
|---|---|---|
| committer | 2016-01-23 14:16:58 +0000 | |
| commit | 5d5dbeb0344fa57f34cee40f01f96829eae4b514 (patch) | |
| tree | 5e4a1f49fe8e59c105397b53da3a5a963a22a9ff /compiler/image_test.cc | |
| parent | 01ebf4a0197ab221cb5af348607696458c5b927a (diff) | |
| parent | 1bc977cf2f8199311a97f2ba9431a184540e3e9c (diff) | |
Merge "Revert "Load app images""
Diffstat (limited to 'compiler/image_test.cc')
| -rw-r--r-- | compiler/image_test.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/compiler/image_test.cc b/compiler/image_test.cc index b8416751c5..12132c0cd0 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -155,11 +155,7 @@ void ImageTest::TestWriteRead(ImageHeader::StorageMode storage_mode) { { std::vector<const char*> dup_oat_filename(1, dup_oat->GetPath().c_str()); std::vector<const char*> dup_image_filename(1, image_file.GetFilename().c_str()); - bool success_image = writer->Write(kInvalidFd, - dup_image_filename, - kInvalidFd, - dup_oat_filename, - dup_oat_filename[0]); + bool success_image = writer->Write(kInvalidImageFd, dup_image_filename, dup_oat_filename); ASSERT_TRUE(success_image); bool success_fixup = ElfWriter::Fixup(dup_oat.get(), writer->GetOatDataBegin(dup_oat_filename[0])); @@ -296,17 +292,11 @@ TEST_F(ImageTest, ImageHeaderIsValid) { oat_data_begin, oat_data_end, oat_file_end, - /*boot_image_begin*/0U, - /*boot_image_size*/0U, - /*boot_oat_begin*/0U, - /*boot_oat_size_*/0U, sizeof(void*), /*compile_pic*/false, - /*is_pic*/false, ImageHeader::kDefaultStorageMode, /*data_size*/0u); ASSERT_TRUE(image_header.IsValid()); - ASSERT_TRUE(!image_header.IsAppImage()); char* magic = const_cast<char*>(image_header.GetMagic()); strcpy(magic, ""); // bad magic |