Fix Subzero build on Android. Change-Id: If560b8b41b869458ff4b3a6a314f389c8e7a22f9 Reviewed-on: https://swiftshader-review.googlesource.com/17648 Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Common/Version.h b/src/Common/Version.h index f73a7e9..1747820 100644 --- a/src/Common/Version.h +++ b/src/Common/Version.h
@@ -15,7 +15,7 @@ #define MAJOR_VERSION 4 #define MINOR_VERSION 0 #define BUILD_VERSION 0 -#define BUILD_REVISION 1 +#define BUILD_REVISION 2 #define STRINGIFY(x) #x #define MACRO_STRINGIFY(x) STRINGIFY(x)
diff --git a/src/Reactor/Android.mk b/src/Reactor/Android.mk index 9944185..fa90a1a 100644 --- a/src/Reactor/Android.mk +++ b/src/Reactor/Android.mk
@@ -108,7 +108,7 @@ LOCAL_CPPFLAGS := -std=c++11 -LOCAL_CFLAGS += +LOCAL_CFLAGS += \ -DLOG_TAG=\"libsubzero\" \ -Wall \ -Werror \ @@ -117,7 +117,8 @@ -Wno-unused-parameter \ -Wno-implicit-exception-spec-mismatch \ -Wno-overloaded-virtual \ - -Wno-non-virtual-dtor + -Wno-non-virtual-dtor \ + -Wno-unknown-warning-option ifneq (16,${PLATFORM_SDK_VERSION}) LOCAL_CFLAGS += -Xclang -fuse-init-array