Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1562)

Side by Side Diff: gpu/gles2_conform_support/BUILD.gn

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « extensions/shell/app_shell.gyp ('k') | gpu/gles2_conform_support/gles2_conform_support.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 declare_args() { 5 declare_args() {
6 # Set to true to compile with the OpenGL ES 2.0 conformance tests. 6 # Set to true to compile with the OpenGL ES 2.0 conformance tests.
7 internal_gles2_conform_tests = false 7 internal_gles2_conform_tests = false
8 } 8 }
9 9
10 config("gles2_conform_test_warnings") { 10 config("gles2_conform_test_warnings") {
(...skipping 15 matching lines...) Expand all
26 "-Wno-sometimes-uninitialized", 26 "-Wno-sometimes-uninitialized",
27 "-Wno-tautological-compare", 27 "-Wno-tautological-compare",
28 28
29 # GTFVecBase.h contains static no-inline functions in a header :-/ 29 # GTFVecBase.h contains static no-inline functions in a header :-/
30 "-Wno-unused-function", 30 "-Wno-unused-function",
31 "-Wno-unused-variable", 31 "-Wno-unused-variable",
32 ] 32 ]
33 } 33 }
34 } 34 }
35 35
36 import("//build/config/allocator.gni")
37 import("//testing/test.gni") 36 import("//testing/test.gni")
38 37
39 # GYP version: gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform _support 38 # GYP version: gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform _support
40 executable("gles2_conform_support") { 39 executable("gles2_conform_support") {
41 sources = [ 40 sources = [
42 "gles2_conform_support.c", 41 "gles2_conform_support.c",
43 "native/egl_native.cc", 42 "native/egl_native.cc",
44 "native/egl_native_win.cc", 43 "native/egl_native_win.cc",
45 "native/main.cc", 44 "native/main.cc",
46 ] 45 ]
(...skipping 10 matching lines...) Expand all
57 "//gpu/command_buffer/client:gles2_c_lib_nocheck", 56 "//gpu/command_buffer/client:gles2_c_lib_nocheck",
58 "//gpu/gles2_conform_support/egl", 57 "//gpu/gles2_conform_support/egl",
59 "//ui/gl", 58 "//ui/gl",
60 ] 59 ]
61 if (is_linux) { 60 if (is_linux) {
62 sources += [ 61 sources += [
63 "native/egl_native_aura.cc", 62 "native/egl_native_aura.cc",
64 "native/egl_native_x11.cc", 63 "native/egl_native_x11.cc",
65 ] 64 ]
66 } 65 }
67 if (use_allocator != "none") {
68 # See http://crbug.com/162998#c4 for why this is needed.
69 deps += [ "//base/allocator" ]
70 }
71 } 66 }
72 67
73 if (internal_gles2_conform_tests) { 68 if (internal_gles2_conform_tests) {
74 action("generate_gles2_conform_embedded_data") { 69 action("generate_gles2_conform_embedded_data") {
75 script = "generate_gles2_embedded_data.py" 70 script = "generate_gles2_embedded_data.py"
76 outputs = [ 71 outputs = [
77 "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.c", 72 "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.c",
78 "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.h", 73 "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.h",
79 "$target_gen_dir/gles2_conform_test_embedded_data/FilesTOC.c", 74 "$target_gen_dir/gles2_conform_test_embedded_data/FilesTOC.c",
80 ] 75 ]
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 ":gles2_conform_test_windowless", 199 ":gles2_conform_test_windowless",
205 ] 200 ]
206 deps += [ ":generate_gles2_conform_tests" ] 201 deps += [ ":generate_gles2_conform_tests" ]
207 sources += [ "$target_gen_dir/gles2_conform_test_autogen.cc" ] 202 sources += [ "$target_gen_dir/gles2_conform_test_autogen.cc" ]
208 data += [ "//third_party/gles2_conform/GTF_ES/" ] 203 data += [ "//third_party/gles2_conform/GTF_ES/" ]
209 204
210 # TODO: Make these tests pull in the correct data dependencies once they 205 # TODO: Make these tests pull in the correct data dependencies once they
211 # are exported in GN. Maybe from //third_party/gles2_conform/GTF_ES/ 206 # are exported in GN. Maybe from //third_party/gles2_conform/GTF_ES/
212 } 207 }
213 } 208 }
OLDNEW
« no previous file with comments | « extensions/shell/app_shell.gyp ('k') | gpu/gles2_conform_support/gles2_conform_support.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698