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

Commit 4f145c96 authored by Patrick Scott's avatar Patrick Scott
Browse files

Fix debug statements and aapt assert. 

ENABLE_PSEUDOLOCALIZE seems to not exist.

Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
parent 48c9daac

core/jni/android_app_NativeActivity.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ static const char* const kNativeActivityPathName = "android/app/NativeActivity"; 


#define FIND_CLASS(var, className) \

        var = env->FindClass(className); \

        LOG_FATAL_IF(! var, "Unable to find class " className); \

        LOG_FATAL_IF(! var, "Unable to find class %s", className); \

        var = jclass(env->NewGlobalRef(var));



#define GET_METHOD_ID(var, clazz, methodName, fieldDescriptor) \

tools/aapt/XMLNode.cpp

+0 −4
Original line number Diff line number Diff line
@@ -203,13 +203,9 @@ status_t parseStyledString(Bundle* bundle, 
                }

            }

            if (xliffDepth == 0 && pseudolocalize) {

#ifdef ENABLE_PSEUDOLOCALIZE

                std::string orig(String8(text).string());

                std::string pseudo = pseudolocalize_string(orig);

                curString.append(String16(String8(pseudo.c_str())));

#else

                assert(false);

#endif

            } else {

                if (isFormatted && hasSubstitutionErrors(fileName, inXml, text) != NO_ERROR) {

                    return UNKNOWN_ERROR;