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

Commit 4c5806b6 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Use the icu:: namespace for icu4c API. 

The icu guys recommend working this way, though it's not the default.
Internally Google makes this the default, and I've switched libcore
over.

Bug: 15350832
Change-Id: I038e12bea58dd089a46d0e681b5ab76cfc19d7b9
parent e59b7ce2

core/jni/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ endif 


LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES



LOCAL_CFLAGS += -DU_USING_ICU_NAMESPACE=0



LOCAL_SRC_FILES:= \

    AndroidRuntime.cpp \

    com_android_internal_content_NativeLibraryHelper.cpp \

core/jni/android_text_StaticLayout.cpp

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace android { 


class ScopedBreakIterator {

    public:

        ScopedBreakIterator(JNIEnv* env, BreakIterator* breakIterator, jcharArray inputText,

        ScopedBreakIterator(JNIEnv* env, icu::BreakIterator* breakIterator, jcharArray inputText,

                            jint length) : mBreakIterator(breakIterator), mChars(env, inputText) {

            UErrorCode status = U_ZERO_ERROR;

            mUText = utext_openUChars(NULL, mChars.get(), length, &status);
@@ -41,7 +41,7 @@ class ScopedBreakIterator { 
            mBreakIterator->setText(mUText, status);

        }



        inline BreakIterator* operator->() {

        inline icu::BreakIterator* operator->() {

            return mBreakIterator;

        }
@@ -50,7 +50,7 @@ class ScopedBreakIterator { 
            delete mBreakIterator;

        }

    private:

        BreakIterator* mBreakIterator;

        icu::BreakIterator* mBreakIterator;

        ScopedCharArrayRO mChars;

        UText* mUText;
@@ -68,14 +68,14 @@ static jintArray nLineBreakOpportunities(JNIEnv* env, jclass, jstring javaLocale 
    ScopedIcuLocale icuLocale(env, javaLocaleName);

    if (icuLocale.valid()) {

        UErrorCode status = U_ZERO_ERROR;

        BreakIterator* it = BreakIterator::createLineInstance(icuLocale.locale(), status);

        icu::BreakIterator* it = icu::BreakIterator::createLineInstance(icuLocale.locale(), status);

        if (!U_SUCCESS(status) || it == NULL) {

            if (it) {

                delete it;

            }

        } else {

            ScopedBreakIterator breakIterator(env, it, inputText, length);

            for (int loc = breakIterator->first(); loc != BreakIterator::DONE;

            for (int loc = breakIterator->first(); loc != icu::BreakIterator::DONE;

                    loc = breakIterator->next()) {

                breaks.push_back(loc);

            }