AAPT2: Disambiguate merging of resources
Merging local app resources is slightly different than merging
resources from a static library.
Local app resources may not have a package name set, but we do take interest in the
ID set for the package (should be 0x0 or match the ID of the app we're building).
Static library resources have an explicit package name defined for them, so we
only merge resources from that package.
Change-Id: I95e559ae94cc1df6972e77a347b1b37a93674c4d
diff --git a/tools/aapt2/link/Link.cpp b/tools/aapt2/link/Link.cpp
index 0236e98..9ce3734 100644
--- a/tools/aapt2/link/Link.cpp
+++ b/tools/aapt2/link/Link.cpp
@@ -49,6 +49,7 @@
std::string manifestPath;
std::vector<std::string> includePaths;
Maybe<std::string> generateJavaClassPath;
+ std::vector<std::string> extraJavaPackages;
Maybe<std::string> generateProguardRulesPath;
bool noAutoVersion = false;
bool staticLib = false;
@@ -695,6 +696,9 @@
options.useFinal = false;
}
+ StringPiece16 actualPackage = mContext.getCompilationPackage();
+ StringPiece16 outputPackage = mContext.getCompilationPackage();
+
if (mOptions.privateSymbols) {
// If we defined a private symbols package, we only emit Public symbols
// to the original package, and private and public symbols to the private package.
@@ -706,16 +710,16 @@
}
options.types = JavaClassGeneratorOptions::SymbolTypes::kPublicPrivate;
- if (!writeJavaFile(&mergedTable, mContext.getCompilationPackage(),
- mOptions.privateSymbols.value(), options)) {
- return 1;
- }
+ outputPackage = mOptions.privateSymbols.value();
+ }
- } else {
- // Emit Everything.
+ if (!writeJavaFile(&mergedTable, actualPackage, outputPackage, options)) {
+ return 1;
+ }
- if (!writeJavaFile(&mergedTable, mContext.getCompilationPackage(),
- mContext.getCompilationPackage(), options)) {
+ for (std::string& extraPackage : mOptions.extraJavaPackages) {
+ if (!writeJavaFile(&mergedTable, actualPackage, util::utf8ToUtf16(extraPackage),
+ options)) {
return 1;
}
}
@@ -770,6 +774,8 @@
"private symbols.\n"
"If not specified, public and private symbols will use the application's "
"package name", &privateSymbolsPackage)
+ .optionalFlagList("--extra-packages", "Generate the same R.java but with different "
+ "package names", &options.extraJavaPackages)
.optionalSwitch("-v", "Enables verbose logging", &options.verbose);
if (!flags.parse("aapt2 link", args, &std::cerr)) {