From f2d8a8efb5e033a00d4e4dd8cc587b7d5001df7c Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Thu, 15 Nov 2018 23:40:14 -0800 Subject: Switch to gnu++11 for spirv-llvm. This library depends on a snapshot of LLVM that only works with C++11. Bug: http://b/111067277 Test: Build with default cpp_std as C++17. Change-Id: I00643842c5f4b47464709c7ff232f287e15586d0 --- lib/SPIRV/Android.bp | 1 + tools/llvm-spirv/Android.bp | 1 + 2 files changed, 2 insertions(+) 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: { -- cgit v1.2.3