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.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools/aapt2/java/JavaClassGenerator.cpp') diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index 9c0f13c0241d..68bdb959ca07 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -533,9 +533,14 @@ bool JavaClassGenerator::Generate(const StringPiece& package_name_to_generate, std::unique_ptr rewrite_method; // Generate an onResourcesLoaded() callback if requested. - if (options_.generate_rewrite_callback) { + if (options_.rewrite_callback_options) { rewrite_method = util::make_unique("public static void onResourcesLoaded(int p)"); + for (const std::string& package_to_callback : + options_.rewrite_callback_options.value().packages_to_callback) { + rewrite_method->AppendStatement( + StringPrintf("%s.R.onResourcesLoaded(p);", package_to_callback.data())); + } } for (const auto& package : table_->packages) { -- cgit v1.2.3