diff options
| author | 2016-01-23 14:15:49 +0000 | |
|---|---|---|
| committer | 2016-01-23 14:15:49 +0000 | |
| commit | 1bc977cf2f8199311a97f2ba9431a184540e3e9c (patch) | |
| tree | 580a02752d8e447f6dce7cce01386c7e2a9a87f4 /compiler/image_test.cc | |
| parent | f7fd970244f143b1abb956e29794c446e4d57f46 (diff) | |
Revert "Load app images"
Fails when a method is duplicated (see test 097-duplicate-method)
Bug: 22858531
This reverts commit f7fd970244f143b1abb956e29794c446e4d57f46.
Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20
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 |