AAPT2: Add --package-id flag for feature-split suppport
Bug: 35928935
Change-Id: Ia8496505e61cfcfdb8f9f62366d2f36e453db111
Test: make aapt2_tests
diff --git a/tools/aapt2/link/ReferenceLinker.h b/tools/aapt2/link/ReferenceLinker.h
index 2d18c49d..b3d0196 100644
--- a/tools/aapt2/link/ReferenceLinker.h
+++ b/tools/aapt2/link/ReferenceLinker.h
@@ -59,8 +59,8 @@
* returned. out_error holds the error message.
*/
static const SymbolTable::Symbol* ResolveSymbolCheckVisibility(const Reference& reference,
+ const CallSite& callsite,
SymbolTable* symbols,
- CallSite* callsite,
std::string* out_error);
/**
@@ -70,8 +70,8 @@
* ISymbolTable::Symbol::attribute.
*/
static const SymbolTable::Symbol* ResolveAttributeCheckVisibility(const Reference& reference,
+ const CallSite& callsite,
SymbolTable* symbols,
- CallSite* callsite,
std::string* out_error);
/**
@@ -80,7 +80,8 @@
* If resolution fails, outError holds the error message.
*/
static Maybe<xml::AaptAttribute> CompileXmlAttribute(const Reference& reference,
- SymbolTable* symbols, CallSite* callsite,
+ const CallSite& callsite,
+ SymbolTable* symbols,
std::string* out_error);
/**
@@ -99,9 +100,8 @@
* Returns false on failure, and an error message is logged to the
* IDiagnostics in the context.
*/
- static bool LinkReference(Reference* reference, IAaptContext* context,
- SymbolTable* symbols, xml::IPackageDeclStack* decls,
- CallSite* callsite);
+ static bool LinkReference(const CallSite& callsite, Reference* reference, IAaptContext* context,
+ SymbolTable* symbols, xml::IPackageDeclStack* decls);
/**
* Links all references in the ResourceTable.