commit a068eeddc9d47af1a12afbe6efe7d00e8e903b9f
author Xavier Ducrohet <xav@android.com> Sat Apr 13 09:48:01 2013 -0700
committer Xavier Ducrohet <xav@android.com> Sat Apr 13 09:48:01 2013 -0700
tree df9f8663d47adc21195ea822fc107c514d514c27
parent 301e95f2e17164c6f432f1b68f55e5f12aa0ca78

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

This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 44aaa43..77168f9 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -1597,7 +1597,7 @@
 
 static status_t writeLayoutClasses(
     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);
     if (!includePrivate) {
@@ -1612,14 +1612,6 @@
     indentStr = getIndentSpace(indent);
     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 N = symbols->getNestedSymbols().size();
     for (i=0; i<N; i++) {
@@ -1753,7 +1745,8 @@
         }
         
         fprintf(fp,
-                id_array_format,
+                "%spublic static final int[] %s = {\n"
+                "%s",
                 indentStr, nclassName.string(),
                 getIndentSpace(indent+1));
 
@@ -1847,7 +1840,7 @@
                     fprintf(fp, "%s@Deprecated\n", indentStr);
                 }
                 fprintf(fp,
-                        id_array_index_format,
+                        "%spublic static final int %s_%s = %d;\n",
                         indentStr, nclassName.string(),
                         String8(name).string(), (int)pos);
             }
@@ -2090,7 +2083,7 @@
     }
 
     if (styleableSymbols != NULL) {
-        err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate, nonConstantId);
+        err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate);
         if (err != NO_ERROR) {
             return err;
         }