Add blueprint modules to generate jar files for gtests.
This will be needed to run gtests under atest.
The output is unused for now.
Some of the tests in makefile were renamed for consistency.
Test: m test-art-host-gtest
Bug: 147819342
Bug: 147817606
Change-Id: I96db24406881a2adeeec7889f04681ae18352b16
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 2d2b958..687e3ff 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -1636,7 +1636,7 @@
}
TEST_F(Dex2oatTest, UncompressedTest) {
- std::unique_ptr<const DexFile> dex(OpenTestDexFile("MainUncompressed"));
+ std::unique_ptr<const DexFile> dex(OpenTestDexFile("MainUncompressedAligned"));
std::string out_dir = GetScratchDir();
const std::string base_oat_name = out_dir + "/base.oat";
ASSERT_TRUE(GenerateOdexForTest(dex->GetLocation(),
@@ -2168,7 +2168,7 @@
}
TEST_F(Dex2oatTest, ZipFd) {
- std::string zip_location = GetTestDexFileName("MainUncompressed");
+ std::string zip_location = GetTestDexFileName("MainUncompressedAligned");
std::unique_ptr<File> dex_file(OS::OpenFileForReading(zip_location.c_str()));
std::vector<std::string> extra_args{
StringPrintf("--zip-fd=%d", dex_file->Fd()),