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

Side by Side Diff: BUILD.gn

Issue 2338173004: Revert of GN: support 32-bit x86 builds (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | gn/BUILD.gn » ('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 2016 Google Inc. 1 # Copyright 2016 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import("gn/shared_sources.gni") 6 import("gn/shared_sources.gni")
7 7
8 declare_args() { 8 declare_args() {
9 skia_enable_tools = !is_fuchsia && !is_component_build 9 skia_enable_tools = !is_fuchsia && !is_component_build
10 10
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 547
548 action("skia.h") { 548 action("skia.h") {
549 script = "gn/echo_headers.py" 549 script = "gn/echo_headers.py"
550 args = [ rebase_path("$target_gen_dir/skia.h", root_build_dir) ] + 550 args = [ rebase_path("$target_gen_dir/skia.h", root_build_dir) ] +
551 rebase_path(skia_h_headers, target_gen_dir) 551 rebase_path(skia_h_headers, target_gen_dir)
552 outputs = [ 552 outputs = [
553 "$target_gen_dir/skia.h", 553 "$target_gen_dir/skia.h",
554 ] 554 ]
555 } 555 }
556 556
557 if (target_cpu == "x64") { 557 executable("fiddle") {
558 # Our bots only have 64-bit libOSMesa installed. 558 include_dirs = [ "$target_gen_dir" ]
559 # TODO: worth fixing? 559 libs = []
560 executable("fiddle") { 560 if (is_linux) {
561 include_dirs = [ "$target_gen_dir" ] 561 libs += [ "OSMesa" ]
562 libs = [] 562 }
563 if (is_linux) {
564 libs += [ "OSMesa" ]
565 }
566 563
567 sources = [ 564 sources = [
568 "src/images/SkForceLinking.cpp", 565 "src/images/SkForceLinking.cpp",
569 "tools/fiddle/draw.cpp", 566 "tools/fiddle/draw.cpp",
570 "tools/fiddle/fiddle_main.cpp", 567 "tools/fiddle/fiddle_main.cpp",
571 ] 568 ]
572 deps = [ 569 deps = [
573 ":skia", 570 ":skia",
574 ":skia.h", 571 ":skia.h",
575 ] 572 ]
576 }
577 } 573 }
578 574
579 # Targets guarded by skia_enable_tools may use //third_party freely. 575 # Targets guarded by skia_enable_tools may use //third_party freely.
580 if (skia_enable_tools) { 576 if (skia_enable_tools) {
581 template("test_lib") { 577 template("test_lib") {
582 config(target_name + "_config") { 578 config(target_name + "_config") {
583 include_dirs = invoker.public_include_dirs 579 include_dirs = invoker.public_include_dirs
584 } 580 }
585 source_set(target_name) { 581 source_set(target_name) {
586 forward_variables_from(invoker, "*", [ "public_include_dirs" ]) 582 forward_variables_from(invoker, "*", [ "public_include_dirs" ])
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 sources = [ 835 sources = [
840 "tools/SkShaper_primitive.cpp", 836 "tools/SkShaper_primitive.cpp",
841 "tools/using_skia_and_harfbuzz.cpp", 837 "tools/using_skia_and_harfbuzz.cpp",
842 ] 838 ]
843 deps = [ 839 deps = [
844 ":skia", 840 ":skia",
845 ] 841 ]
846 testonly = true 842 testonly = true
847 } 843 }
848 } 844 }
OLDNEW
« no previous file with comments | « no previous file | gn/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698