| Index: gpu/khronos_glcts_support/BUILD.gn
|
| diff --git a/gpu/khronos_glcts_support/BUILD.gn b/gpu/khronos_glcts_support/BUILD.gn
|
| index 9df5736910c223f5924b66fa01cedc3c9003193f..597c87c6364aa5a5c3fcb879da66a2f4d74a6ffa 100644
|
| --- a/gpu/khronos_glcts_support/BUILD.gn
|
| +++ b/gpu/khronos_glcts_support/BUILD.gn
|
| @@ -168,14 +168,11 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":decpp_config" ]
|
| -
|
| - if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| - }
|
| }
|
|
|
| # GYP version: gpu/khronos_glcts_support/khronos_glcts_framework.gyp:delibs
|
| @@ -237,13 +234,13 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":tcutil_config" ]
|
|
|
| if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| cflags_cc = [ "-Wno-int-to-pointer-cast" ]
|
| }
|
| }
|
| @@ -263,14 +260,11 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":glwrapper_config" ]
|
| -
|
| - if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| - }
|
| }
|
|
|
| # GYP version: gpu/khronos_glcts_support/khronos_glcts_framework.gyp:glutil
|
| @@ -292,14 +286,11 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":glutil_config" ]
|
| -
|
| - if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| - }
|
| }
|
|
|
| # GYP version: gpu/khronos_glcts_support/khronos_glcts_framework.gyp:tcutil_egl
|
| @@ -321,6 +312,7 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| @@ -330,7 +322,6 @@ if (internal_khronos_glcts_tests) {
|
| ]
|
|
|
| if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| cflags_cc = [ "-Wno-int-to-void-pointer-cast" ]
|
| }
|
| }
|
| @@ -363,13 +354,13 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":glcts_common_config" ]
|
|
|
| if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| cflags_cc = [ "-Wno-string-conversion" ]
|
| }
|
| }
|
| @@ -394,14 +385,11 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":glcts_gtf_wrapper_config" ]
|
| -
|
| - if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| - }
|
| }
|
|
|
| # GYP version: gpu/khronos_glcts_support/khronos_glcts_gtf.gyp:gtf_es
|
| @@ -458,14 +446,11 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":glcts_gtf_config" ]
|
| -
|
| - if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| - }
|
| }
|
|
|
| # GYP version: gpu/khronos_glcts_support/khronos_glcts_cts.gyp:glcts_es2
|
| @@ -489,14 +474,11 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| configs -= [ "//build/config/compiler:no_rtti" ]
|
| configs += [ "//build/config/compiler:rtti" ]
|
|
|
| public_configs = [ ":glcts_es2_config" ]
|
| -
|
| - if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| - }
|
| }
|
|
|
| # GYP version: gpu/khronos_glcts_support/khronos_glcts_test.gyp:tcutil_platform_windowless
|
| @@ -533,10 +515,7 @@ if (internal_khronos_glcts_tests) {
|
| configs += [ ":defaults_config" ]
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| -
|
| - if (is_linux) {
|
| - configs -= [ "//build/config/gcc:no_exceptions" ]
|
| - }
|
| + configs -= [ "//build/config/compiler:no_exceptions" ]
|
| }
|
| }
|
|
|
|
|