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/TableMerger.h b/tools/aapt2/link/TableMerger.h
index 157c16e..c903f1b 100644
--- a/tools/aapt2/link/TableMerger.h
+++ b/tools/aapt2/link/TableMerger.h
@@ -60,8 +60,16 @@
return mMergedPackages;
}
+ /**
+ * Merges resources from the same or empty package. This is for local sources.
+ */
bool merge(const Source& src, ResourceTable* table);
+ /**
+ * Merges resources from the given package, mangling the name. This is for static libraries.
+ */
+ bool mergeAndMangle(const Source& src, const StringPiece16& package, ResourceTable* table);
+
private:
IAaptContext* mContext;
ResourceTable* mMasterTable;