Skip to content

S
swiftshader
Commit 3c00576b by Nicolas Capens Committed by Nicolas Capens
Options

Fix Subzero build on Android.

Change-Id: If560b8b41b869458ff4b3a6a314f389c8e7a22f9 Reviewed-on: https://swiftshader-review.googlesource.com/17648Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 4be91715
Showing with 4 additions and 3 deletions
src/Common/Version.h
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#define MAJOR_VERSION 4 #define MAJOR_VERSION 4
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1 #define BUILD_REVISION 2
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
src/Reactor/Android.mk
...@@ -108,7 +108,7 @@ LOCAL_SRC_FILES += \ ...@@ -108,7 +108,7 @@ LOCAL_SRC_FILES += \
LOCAL_CPPFLAGS := -std=c++11 LOCAL_CPPFLAGS := -std=c++11
LOCAL_CFLAGS += LOCAL_CFLAGS += \
-DLOG_TAG=\"libsubzero\" \ -DLOG_TAG=\"libsubzero\" \
-Wall \ -Wall \
-Werror \ -Werror \
...@@ -117,7 +117,8 @@ LOCAL_CFLAGS += ...@@ -117,7 +117,8 @@ LOCAL_CFLAGS +=
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-non-virtual-dtor -Wno-non-virtual-dtor \
-Wno-unknown-warning-option
ifneq (16,${PLATFORM_SDK_VERSION}) ifneq (16,${PLATFORM_SDK_VERSION})
LOCAL_CFLAGS += -Xclang -fuse-init-array LOCAL_CFLAGS += -Xclang -fuse-init-array
......
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