From b5dc4bd49a036e3403ca17e961d2c8e13e038295 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 22 Feb 2017 19:29:29 -0800 Subject: AAPT2: Few tweaks to get shared-libraries working Test: manual (building shared support library demo) Change-Id: I4730645aa92ba1893baf67ffe35fbd4aac0f8e46 --- tools/aapt2/java/JavaClassGenerator_test.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp') diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp index bcb2d4f42eda..271279ff5e92 100644 --- a/tools/aapt2/java/JavaClassGenerator_test.cpp +++ b/tools/aapt2/java/JavaClassGenerator_test.cpp @@ -381,7 +381,9 @@ TEST(JavaClassGeneratorTest, GenerateOnResourcesLoadedCallbackForSharedLibrary) JavaClassGeneratorOptions options; options.use_final = false; - options.generate_rewrite_callback = true; + options.rewrite_callback_options = OnResourcesLoadedCallbackOptions{ + {"com.foo", "com.boo"}, + }; JavaClassGenerator generator(context.get(), table.get(), options); std::stringstream out; @@ -389,7 +391,9 @@ TEST(JavaClassGeneratorTest, GenerateOnResourcesLoadedCallbackForSharedLibrary) std::string actual = out.str(); - EXPECT_NE(std::string::npos, actual.find("onResourcesLoaded")); + EXPECT_NE(std::string::npos, actual.find("void onResourcesLoaded")); + EXPECT_NE(std::string::npos, actual.find("com.foo.R.onResourcesLoaded")); + EXPECT_NE(std::string::npos, actual.find("com.boo.R.onResourcesLoaded")); } } // namespace aapt -- cgit v1.2.3