summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-11-18 04:09:48 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-11-18 04:09:48 +0000
commita6c1cc7b8b4482009d03116aadd375509fa0c843 (patch)
tree67ff2733a1e04ea2da5369403a7b7086fe182d78
parentd718b4ac78f8f3946266d8c254a2082bb786bdab (diff)
parent8174aa87bae66872b293d36f1da07c921fd09c13 (diff)
downloadspirv-llvm-a6c1cc7b8b4482009d03116aadd375509fa0c843.tar.gz
Snap for 5138341 from 8174aa87bae66872b293d36f1da07c921fd09c13 to qt-release
Change-Id: I33796653579bd05033851315e7fdb5ab1335ebae
-rw-r--r--lib/SPIRV/Android.bp1
-rw-r--r--tools/llvm-spirv/Android.bp1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/SPIRV/Android.bp b/lib/SPIRV/Android.bp
index a6cac539..959074a6 100644
--- a/lib/SPIRV/Android.bp
+++ b/lib/SPIRV/Android.bp
@@ -87,6 +87,7 @@ cc_library_shared {
"-Werror",
"-Wno-unused-parameter",
],
+ cpp_std: "gnu++11",
clang_cflags: [
// Temporarily suppress the warnings http://b/37867503
diff --git a/tools/llvm-spirv/Android.bp b/tools/llvm-spirv/Android.bp
index 2ad2c936..0f36d5de 100644
--- a/tools/llvm-spirv/Android.bp
+++ b/tools/llvm-spirv/Android.bp
@@ -53,6 +53,7 @@ cc_binary {
"-Werror",
"-Wno-unused-parameter",
],
+ cpp_std: "gnu++11",
product_variables: {
unbundled_build: {