diff options
author | petermayo <petermayo@chromium.org> | 2015-09-04 15:43:27 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-04 22:44:41 +0000 |
commit | 81a6d587813badcf21de8bf771a9621e307d5ebb (patch) | |
tree | 1c5073dafddfb92f7b84c6bcf98fa845ce27aade /gpu/gles2_conform_support | |
parent | 5d4a2a91096ffce9d44b0850c288da6bb57bc7c6 (diff) | |
download | chromium_src-81a6d587813badcf21de8bf771a9621e307d5ebb.zip chromium_src-81a6d587813badcf21de8bf771a9621e307d5ebb.tar.gz chromium_src-81a6d587813badcf21de8bf771a9621e307d5ebb.tar.bz2 |
Fix support for internal_gles2_conform_test = true
The build file seems fairly approximate for this use case.
This flag is set by ChromeOS ebuild contexts in GYP.
BUG=527968
TEST=set flag in gn args, gn gen
Wait for it, this gets much bigger ...
Review URL: https://codereview.chromium.org/1322223003
Cr-Commit-Position: refs/heads/master@{#347511}
Diffstat (limited to 'gpu/gles2_conform_support')
-rw-r--r-- | gpu/gles2_conform_support/BUILD.gn | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/gpu/gles2_conform_support/BUILD.gn b/gpu/gles2_conform_support/BUILD.gn index 1a83385..87f0362 100644 --- a/gpu/gles2_conform_support/BUILD.gn +++ b/gpu/gles2_conform_support/BUILD.gn @@ -47,27 +47,30 @@ executable("gles2_conform_support") { if (internal_gles2_conform_tests) { action("generate_gles2_conform_embedded_data") { script = "generate_gles2_embedded_data.py" - output = [ - "$target_gen_dir/gles2_conform_test_embedded_data/FilesData.c", - "$target_gen_dir/gles2_conform_test_embedded_data/FilesData.h", + outputs = [ + "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.c", + "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.h", "$target_gen_dir/gles2_conform_test_embedded_data/FilesTOC.c", ] args = [ - "../../third_party/gles2_conform/GTF_ES/glsl/GTF", - "$target_gen_dir/gles2_conform_test_embedded_data", + rebase_path("//third_party/gles2_conform/GTF_ES/glsl/GTF"), + rebase_path("$target_gen_dir/gles2_conform_test_embedded_data"), ] } - gles2_conform_gypi = exec_script("//build/gypi_to_gn.py", - [ rebase_path("gles2_conform_gypi") ], - "scoped", - [ "gles2_conform_gypi" ]) + gles2_conform_gypi = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("gles2_conform.gypi"), + "--replace=<(DEPTH)=../..", + "--replace=<(SHARED_INTERMEDIATE_DIR)=$target_gen_dir", + ], + "scope", + [ "gles2_conform.gypi" ]) executable("gles2_conform_test_windowless") { testonly = true - sources = [ - # Include a dummy c++ file to force linking of libstdc++. - "dummy.cc", - gles2_conform_gypi.gtf_es_sources, - ] + + # Include a dummy c++ file to force linking of libstdc++. + sources = [ "dummy.cc" ] + gles2_conform_gypi.gtf_es_sources defines = [ "GTF_API=GTF_GLES20", "HKEMBEDDEDFILESYSTEM", @@ -75,14 +78,14 @@ if (internal_gles2_conform_tests) { deps = [ ":generate_gles2_conform_embedded_data", "//build/config/sanitizers:deps", - "//gpu/command_buffer/client:gles2_c_libnocheck", + "//gpu/command_buffer/client:gles2_c_lib_nocheck", "//gpu/gles2_conform_support/egl", "//gpu/gles2_conform_support/native:windowless", ] - configs += [ "//build/compiler:no_incompatible_pointer_warnings" ] + configs += [ "//build/config/compiler:no_incompatible_pointer_warnings" ] if (is_linux) { if (!is_chromeos) { - deps += [ "//build/linux/system/gtk2" ] + deps += [ "//build/config/linux/gtk2" ] if (is_clang) { cflags = [ @@ -184,8 +187,8 @@ test("gles2_conform_test") { ] if (internal_gles2_conform_tests) { - deps += [ "gles2_conform_test_windowless" ] - - data_deps = [ "//third_party/gles2_conform/GTF_ES/" ] + deps += [ ":gles2_conform_test_windowless" ] + # TODO: Make these tests pull in the correct data dependencies once they + # are exported in GN. Maybe from //third_party/gles2_conform/GTF_ES/ } } |