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

Commit cf670bc7 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

fix build 

  frameworks/base/core/jni/android_text_StaticLayout.cpp: In member function 'int android::OptimizingLineBreaker::desperateBreak(int, int, float, float*, float*, bool*) const':
  frameworks/base/core/jni/android_text_StaticLayout.cpp:263:19: error: variable 'breakWidth' set but not used [-Werror=unused-but-set-variable]
               float breakWidth, breakPrintedWidth;
                   ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp:263:31: error: variable 'breakPrintedWidth' set but not used [-Werror=unused-but-set-variable]
               float breakWidth, breakPrintedWidth;
                               ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp: In function 'jint android::nComputeLineBreaks(JNIEnv*, jclass, jstring, jcharArray, jfloatArray, jint, jfloat, jint, jfloat, jintArray, jint, jboolean, jobject, jintArray, jfloatArray, jbooleanArray, jint)':
  frameworks/base/core/jni/android_text_StaticLayout.cpp:539:15: error: unused variable 'ret' [-Werror=unused-variable]
       jintArray ret;
               ^
  cc1plus: all warnings being treated as errors
  make: *** [out/target/product/hammerhead/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_text_StaticLayout.o] Error 1
  make: *** Waiting for unfinished jobs....

Change-Id: Id2b4c35bd1bc6747cc3d5cf94e3857d9118f5c21
parent 27faad5b

core/jni/android_text_StaticLayout.cpp

+0 −4
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ class OptimizingLineBreaker : public LineBreaker { 
            float w = 0, pw = 0;

            bool breakFound = false;

            int breakIndex = 0, firstTabIndex = INT_MAX;

            float breakWidth, breakPrintedWidth;

            for (int i = start; i < limit; i++) {

                const Primitive& p = mPrimitives[i];
@@ -286,8 +285,6 @@ class OptimizingLineBreaker : public LineBreaker { 
                if (i > start && (p.type == kPrimitiveType_Penalty || p.type == kPrimitiveType_Wordbreak)) {

                    breakFound = true;

                    breakIndex = i;

                    breakWidth = w;

                    breakPrintedWidth = pw;

                }

            }
@@ -536,7 +533,6 @@ static jint nComputeLineBreaks(JNIEnv* env, jclass, jstring javaLocaleName, 
                               jobject recycle, jintArray recycleBreaks,

                               jfloatArray recycleWidths, jbooleanArray recycleFlags,

                               jint recycleLength) {

    jintArray ret;

    std::vector<int> breaks;



    ScopedCharArrayRO textScopedArr(env, inputText);