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

Commit 08a3fa7d authored by Andrew Johnson's avatar Andrew Johnson Committed by Android (Google) Code Review
Browse files

Merge "Removing assignments to localeScriptWasComputed in aapt." into nyc-dev

parents 3db45036 299e488e

tools/aapt/AaptAssets.cpp

+0 −4
Original line number Diff line number Diff line
@@ -388,10 +388,6 @@ void AaptLocaleValue::writeTo(ResTable_config* out) const { 


    if (script[0]) {

        memcpy(out->localeScript, script, sizeof(out->localeScript));

        out->localeScriptWasComputed = false;

    } else {

        out->computeScript();

        out->localeScriptWasComputed = true;

    }



    if (variant[0]) {

tools/aapt2/Locale.cpp

+0 −4
Original line number Diff line number Diff line
@@ -268,10 +268,6 @@ void LocaleValue::writeTo(ResTable_config* out) const { 


    if (script[0]) {

        memcpy(out->localeScript, script, sizeof(out->localeScript));

        out->localeScriptWasComputed = false;

    } else {

        out->computeScript();

        out->localeScriptWasComputed = true;

    }



    if (variant[0]) {