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

am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable."

Browse Source 
* commit 'a068eeddc9d47af1a12afbe6efe7d00e8e903b9f':
  Revert "Make --non-constant-id generates non final IDs for styleable."
This commit is contained in:
Xavier Ducrohet
2013-04-13 09:57:01 -07:00
committed by Android Git Automerger
parent 00c4c67069 a068eeddc9
commit ade20f49a1
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/aapt/Resource.cpp
View File

@@ -1597,7 +1597,7 @@ static String16 getAttributeComment(const sp<AaptAssets>& assets,
static status_t writeLayoutClasses( static status_t writeLayoutClasses(
FILE* fp, const sp<AaptAssets>& assets, FILE* fp, const sp<AaptAssets>& assets,
const sp<AaptSymbols>& symbols, int indent, bool includePrivate, bool nonConstantId) const sp<AaptSymbols>& symbols, int indent, bool includePrivate)
{ {
const char* indentStr = getIndentSpace(indent); const char* indentStr = getIndentSpace(indent);
if (!includePrivate) { if (!includePrivate) {
@@ -1612,14 +1612,6 @@ static status_t writeLayoutClasses(
indentStr = getIndentSpace(indent); indentStr = getIndentSpace(indent);
bool hasErrors = false; bool hasErrors = false;
const char * id_array_format = nonConstantId ?
"%spublic static int[] %s = {\n%s" :
"%spublic static final int[] %s = {\n%s";
const char * id_array_index_format = nonConstantId ?
"%spublic static int %s_%s = %d;\n" :
"%spublic static final int %s_%s = %d;\n";
size_t i; size_t i;
size_t N = symbols->getNestedSymbols().size(); size_t N = symbols->getNestedSymbols().size();
for (i=0; i<N; i++) { for (i=0; i<N; i++) {
@@ -1753,7 +1745,8 @@ static status_t writeLayoutClasses(
} }
fprintf(fp, fprintf(fp,
id_array_format, "%spublic static final int[] %s = {\n"
"%s",
indentStr, nclassName.string(), indentStr, nclassName.string(),
getIndentSpace(indent+1)); getIndentSpace(indent+1));
@@ -1847,7 +1840,7 @@ static status_t writeLayoutClasses(
fprintf(fp, "%s@Deprecated\n", indentStr); fprintf(fp, "%s@Deprecated\n", indentStr);
} }
fprintf(fp, fprintf(fp,
id_array_index_format, "%spublic static final int %s_%s = %d;\n",
indentStr, nclassName.string(), indentStr, nclassName.string(),
String8(name).string(), (int)pos); String8(name).string(), (int)pos);
} }
@@ -2090,7 +2083,7 @@ static status_t writeSymbolClass(
} }
if (styleableSymbols != NULL) { if (styleableSymbols != NULL) {
err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate, nonConstantId); err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate);
if (err != NO_ERROR) { if (err != NO_ERROR) {
return err; return err;
} }