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

Commit 13c62dad authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am c9a4e2f7: am 4194b389: am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8" 

* commit 'c9a4e2f7':
  frameworks/native/opengl: Fix build with gcc 4.8
parents 3fbced6a c9a4e2f7

opengl/tests/gl2_jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ include $(CLEAR_VARS) 
# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS := -Werror

LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter



LOCAL_SRC_FILES:= \

  gl_code.cpp

opengl/tests/gl_jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ include $(CLEAR_VARS) 
# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS := -Werror

LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter



LOCAL_SRC_FILES:= \

  gl_code.cpp

opengl/tests/gl_perfapp/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ include $(CLEAR_VARS) 
# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS := -Werror

LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter



LOCAL_SRC_FILES:= \

  gl_code.cpp

opengl/tests/gldual/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ include $(CLEAR_VARS) 
# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS := -Werror

LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter



LOCAL_SRC_FILES:= \

  gl_code.cpp