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

Commit 0b6c4157 authored by Jesse Hall's avatar Jesse Hall Committed by Gerrit Code Review
Browse files

Merge "frameworks/native/opengl: Fix build with gcc 4.8"

parents cd91024c c80fae6e

opengl/tests/gl2_jni/Android.mk

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

# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_CFLAGS := -Werror

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





LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

  gl_code.cpp

  gl_code.cpp

opengl/tests/gl_jni/Android.mk

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

# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_CFLAGS := -Werror

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





LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

  gl_code.cpp

  gl_code.cpp

opengl/tests/gl_perfapp/Android.mk

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

# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_CFLAGS := -Werror

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





LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

  gl_code.cpp

  gl_code.cpp

opengl/tests/gldual/Android.mk

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

# Optional tag would mean it doesn't get installed by default

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_CFLAGS := -Werror

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





LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

  gl_code.cpp

  gl_code.cpp