Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a068eedd authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

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

This reverts commit 8730f46a.
parent 301e95f2

tools/aapt/Resource.cpp

+5 −12
Original line number Diff line number Diff line
@@ -1597,7 +1597,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, bool nonConstantId)

    const sp<AaptSymbols>& symbols, int indent, bool includePrivate)

{

    const char* indentStr = getIndentSpace(indent);

    if (!includePrivate) {
@@ -1612,14 +1612,6 @@ static status_t writeLayoutClasses( 
    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 @@ static status_t writeLayoutClasses( 
        }

        

        fprintf(fp,

                id_array_format,

                "%spublic static final int[] %s = {\n"

                "%s",

                indentStr, nclassName.string(),

                getIndentSpace(indent+1));
@@ -1847,7 +1840,7 @@ static status_t writeLayoutClasses( 
                    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 @@ static status_t writeSymbolClass( 
    }



    if (styleableSymbols != NULL) {

        err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate, nonConstantId);

        err = writeLayoutClasses(fp, assets, styleableSymbols, indent, includePrivate);

        if (err != NO_ERROR) {

            return err;

        }