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

am c0e40f95: Have styleable indices be non-final for library projects

Browse Source 
* commit 'c0e40f95e07bd5aa9f8f0cd8b0b658c0964cb425':
  Have styleable indices be non-final for library projects
This commit is contained in:
Adam Lesinski
2014-08-07 22:44:43 +00:00
committed by Android Git Automerger
parent d7345c388f e8e9192507
commit 3709ab7d68
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/aapt/Resource.cpp
View File

@@ -1739,7 +1739,7 @@ static String16 getAttributeComment(const sp<AaptAssets>& assets,
static status_t writeLayoutClasses(
FILE* fp, const sp<AaptAssets>& assets,
const sp<AaptSymbols>& symbols, int indent, bool includePrivate)
const sp<AaptSymbols>& symbols, int indent, bool includePrivate, bool nonConstantId)
{
const char* indentStr = getIndentSpace(indent);
if (!includePrivate) {
@@ -1957,8 +1957,13 @@ static status_t writeLayoutClasses(
getSymbolName(name8).string());
fprintf(fp, "%s*/\n", indentStr);
ann.printAnnotations(fp, indentStr);
const char * id_format = nonConstantId ?
"%spublic static int %s_%s = %d;\n" :
"%spublic static final int %s_%s = %d;\n";
fprintf(fp,
"%spublic static final int %s_%s = %d;\n",
id_format,
indentStr, nclassName.string(),
flattenSymbol(name8).string(), (int)pos);
}
@@ -2177,7 +2182,7 @@ static status_t writeSymbolClass(
}
if (styleableSymbols != NULL) {
err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate);
err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate, nonConstantId);
if (err != NO_ERROR) {
return err;
}