Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --auto-add-overlay option to aapt. DO NOT MERGE

Browse Source 
This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>

(merge from master)

Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9
This commit is contained in:
Xavier Ducrohet
2010-02-04 18:45:31 -08:00
parent e88192b9d2
commit b9d2dc2319
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/ResourceTable.cpp
View File

@@ -1587,7 +1587,7 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos,
sourcePos.file.striing(), sourcePos.line, String8(type).string());
}
#endif
if (overlay && !hasBagOrEntry(package, type, name)) {
if (overlay && !mBundle->getAutoAddOverlay() && !hasBagOrEntry(package, type, name)) {
bool canAdd = false;
sp<Package> p = mPackages.valueFor(package);
if (p != NULL) {
@@ -3275,12 +3275,13 @@ sp<ResourceTable::Entry> ResourceTable::Type::getEntry(const String16& entry,
const SourcePos& sourcePos,
const ResTable_config* config,
bool doSetIndex,
bool overlay)
bool overlay,
bool autoAddOverlay)
{
int pos = -1;
sp<ConfigList> c = mConfigs.valueFor(entry);
if (c == NULL) {
if (overlay == true && mCanAddEntries.indexOf(entry) < 0) {
if (overlay && !autoAddOverlay && mCanAddEntries.indexOf(entry) < 0) {
sourcePos.error("Resource at %s appears in overlay but not"
" in the base package; use <add-resource> to add.\n",
String8(entry).string());
@@ -3592,7 +3593,7 @@ sp<ResourceTable::Entry> ResourceTable::getEntry(const String16& package,
if (t == NULL) {
return NULL;
}
return t->getEntry(name, sourcePos, config, doSetIndex, overlay);
return t->getEntry(name, sourcePos, config, doSetIndex, overlay, mBundle->getAutoAddOverlay());
}
sp<const ResourceTable::Entry> ResourceTable::getEntry(uint32_t resID,