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

Commit e51e9186 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am 390854c4: am 538b00f6: Merge "Frameworks/base: Wall Werror in media/mca" 

* commit '390854c4':
  Frameworks/base: Wall Werror in media/mca
parents c4b46d47 390854c4

media/mca/filterfw/jni/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -47,5 +47,7 @@ LOCAL_C_INCLUDES += \ 
# part of a system image.

LOCAL_PRELINK_MODULE := false



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_STATIC_LIBRARY)

media/mca/filterfw/jni/jni_gl_environment.cpp

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 


#include "jni/jni_gl_environment.h"

#include "jni/jni_util.h"

#include <media/mediarecorder.h>

#include "native/core/gl_env.h"

#include <media/mediarecorder.h>



#include <gui/IGraphicBufferProducer.h>

#include <gui/Surface.h>
@@ -92,8 +92,8 @@ jboolean Java_android_filterfw_core_GLEnvironment_nativeIsContextActive(JNIEnv* 
  return gl_env ? ToJBool(gl_env->IsContextActive()) : JNI_FALSE;

}



jboolean Java_android_filterfw_core_GLEnvironment_nativeIsAnyContextActive(JNIEnv* env,

                                                                           jclass clazz) {

jboolean Java_android_filterfw_core_GLEnvironment_nativeIsAnyContextActive(JNIEnv* /* env */,

                                                                           jclass /* clazz */) {

  return ToJBool(GLEnv::IsAnyContextActive());

}

media/mca/filterfw/jni/jni_init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ using namespace android::filterfw; 


JavaVM* g_current_java_vm_ = NULL;



jint JNI_OnLoad(JavaVM* vm, void* reserved) {

jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) {

  // Set the current vm pointer

  g_current_java_vm_ = vm;

media/mca/filterfw/native/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ include $(LOCAL_PATH)/libfilterfw.mk 
# gcc should always be placed at the end.

LOCAL_EXPORT_LDLIBS := -llog -lgcc



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



# TODO: Build a shared library as well?

include $(BUILD_STATIC_LIBRARY)

media/mca/filterfw/native/core/shader_program.cpp

+4 −4
Original line number Diff line number Diff line
@@ -318,15 +318,15 @@ GLuint ShaderProgram::CompileShader(GLenum shader_type, const char* source) { 
      ALOGE("Problem compiling shader! Source:");

      ALOGE("%s", source);

      std::string src(source);

      unsigned int cur_pos = 0;

      unsigned int next_pos = 0;

      int line_number = 1;

      size_t cur_pos = 0;

      size_t next_pos = 0;

      size_t line_number = 1;

      while ( (next_pos = src.find_first_of('\n', cur_pos)) != std::string::npos) {

        ALOGE("%03d : %s", line_number, src.substr(cur_pos, next_pos-cur_pos).c_str());

        cur_pos = next_pos + 1;

        line_number++;

      }

      ALOGE("%03d : %s", line_number, src.substr(cur_pos, next_pos-cur_pos).c_str());

      ALOGE("%03zu : %s", line_number, src.substr(cur_pos, next_pos-cur_pos).c_str());



      GLint log_length = 0;

      glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length);