Skip to content

S
swiftshader
Commit 10b57d42 by Greg Hartman
Options

Allows SwiftShader to identify the Android version

Bug b/36232368 Change-Id: I0a62629db6737134771861710ee0b18826807008 Reviewed-on: https://swiftshader-review.googlesource.com/8949Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent 2ddef885
Showing with 9 additions and 4 deletions
src/OpenGL/compiler/Android.mk
...@@ -27,7 +27,8 @@ COMMON_CFLAGS := \ ...@@ -27,7 +27,8 @@ COMMON_CFLAGS := \
-msse2 \ -msse2 \
-D__STDC_CONSTANT_MACROS \ -D__STDC_CONSTANT_MACROS \
-D__STDC_LIMIT_MACROS \ -D__STDC_LIMIT_MACROS \
-std=c++11 -std=c++11 \
-DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
ifneq (16,${PLATFORM_SDK_VERSION}) ifneq (16,${PLATFORM_SDK_VERSION})
COMMON_CFLAGS += -Xclang -fuse-init-array COMMON_CFLAGS += -Xclang -fuse-init-array
......
src/OpenGL/libEGL/Android.mk
...@@ -7,7 +7,8 @@ COMMON_CFLAGS := \ ...@@ -7,7 +7,8 @@ COMMON_CFLAGS := \
-DEGL_EGLEXT_PROTOTYPES \ -DEGL_EGLEXT_PROTOTYPES \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual -Wno-overloaded-virtual \
-DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
ifneq (16,${PLATFORM_SDK_VERSION}) ifneq (16,${PLATFORM_SDK_VERSION})
COMMON_CFLAGS += -Xclang -fuse-init-array COMMON_CFLAGS += -Xclang -fuse-init-array
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -13,7 +13,8 @@ COMMON_CFLAGS := \ ...@@ -13,7 +13,8 @@ COMMON_CFLAGS := \
-DGL_GLEXT_PROTOTYPES \ -DGL_GLEXT_PROTOTYPES \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual -Wno-overloaded-virtual \
-DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
ifneq (16,${PLATFORM_SDK_VERSION}) ifneq (16,${PLATFORM_SDK_VERSION})
COMMON_CFLAGS += -Xclang -fuse-init-array COMMON_CFLAGS += -Xclang -fuse-init-array
......
src/OpenGL/libGLESv2/Android.mk
...@@ -12,7 +12,8 @@ COMMON_CFLAGS := \ ...@@ -12,7 +12,8 @@ COMMON_CFLAGS := \
-DGL_GLEXT_PROTOTYPES \ -DGL_GLEXT_PROTOTYPES \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual -Wno-overloaded-virtual \
-DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
ifneq (16,${PLATFORM_SDK_VERSION}) ifneq (16,${PLATFORM_SDK_VERSION})
COMMON_CFLAGS += -Xclang -fuse-init-array COMMON_CFLAGS += -Xclang -fuse-init-array
......
third_party/LLVM/Android.mk
...@@ -410,6 +410,7 @@ endif ...@@ -410,6 +410,7 @@ endif
LOCAL_CFLAGS += -fomit-frame-pointer -Os -ffunction-sections -fdata-sections LOCAL_CFLAGS += -fomit-frame-pointer -Os -ffunction-sections -fdata-sections
LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
LOCAL_CFLAGS += -std=c++11 LOCAL_CFLAGS += -std=c++11
LOCAL_CFLAGS += -DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
# Android's make system also uses NDEBUG, so we need to set/unset it forcefully # Android's make system also uses NDEBUG, so we need to set/unset it forcefully
# Uncomment for debug ON: # Uncomment for debug ON:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment