OLD | NEW |
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 import("//third_party/skia/gn/shared_sources.gni") |
| 9 |
8 if (current_cpu == "arm") { | 10 if (current_cpu == "arm") { |
9 import("//build/config/arm.gni") | 11 import("//build/config/arm.gni") |
10 } | 12 } |
11 if (current_cpu == "mipsel" || current_cpu == "mips64el") { | 13 if (current_cpu == "mipsel" || current_cpu == "mips64el") { |
12 import("//build/config/mips.gni") | 14 import("//build/config/mips.gni") |
13 } | 15 } |
14 | 16 |
15 skia_support_gpu = !is_ios | 17 skia_support_gpu = !is_ios |
16 skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview) | 18 skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview) |
17 | 19 |
(...skipping 14 matching lines...) Expand all Loading... |
32 gypi_chromium_skia_defines = | 34 gypi_chromium_skia_defines = |
33 exec_script("//build/gypi_to_gn.py", | 35 exec_script("//build/gypi_to_gn.py", |
34 [ | 36 [ |
35 rebase_path("//skia/chromium_skia_defines.gypi"), | 37 rebase_path("//skia/chromium_skia_defines.gypi"), |
36 "--replace=<(skia_include_path)=//third_party/skia/include", | 38 "--replace=<(skia_include_path)=//third_party/skia/include", |
37 "--replace=<(skia_src_path)=//third_party/skia/src", | 39 "--replace=<(skia_src_path)=//third_party/skia/src", |
38 ], | 40 ], |
39 "scope", | 41 "scope", |
40 [ "//skia/chromium_skia_defines.gypi" ]) | 42 [ "//skia/chromium_skia_defines.gypi" ]) |
41 | 43 |
42 # The list of Skia defines that are to be set for chromium. | |
43 gypi_skia_defines = | |
44 exec_script("//build/gypi_to_gn.py", | |
45 [ | |
46 rebase_path( | |
47 "//third_party/skia/gyp/skia_for_chromium_defines.gypi"), | |
48 "--replace=<(skia_include_path)=//third_party/skia/include", | |
49 "--replace=<(skia_src_path)=//third_party/skia/src", | |
50 ], | |
51 "scope", | |
52 [ "//third_party/skia/gyp/skia_for_chromium_defines.gypi" ]) | |
53 | |
54 # The list of Skia core sources that are to be set for chromium. | |
55 gypi_skia_core = | |
56 exec_script("//build/gypi_to_gn.py", | |
57 [ | |
58 rebase_path("//third_party/skia/gyp/core.gypi"), | |
59 "--replace=<(skia_include_path)=//third_party/skia/include", | |
60 "--replace=<(skia_src_path)=//third_party/skia/src", | |
61 ], | |
62 "scope", | |
63 [ "//third_party/skia/gyp/core.gypi" ]) | |
64 | |
65 # The list of Skia gpu sources that are to be set for chromium. | |
66 if (skia_support_gpu) { | |
67 gypi_skia_gpu = | |
68 exec_script("//build/gypi_to_gn.py", | |
69 [ | |
70 rebase_path("//third_party/skia/gyp/gpu.gypi"), | |
71 "--replace=<(skia_include_path)=//third_party/skia/include", | |
72 "--replace=<(skia_src_path)=//third_party/skia/src", | |
73 ], | |
74 "scope", | |
75 [ "//third_party/skia/gyp/gpu.gypi" ]) | |
76 } | |
77 | |
78 # The list of Skia pdf sources that are to be set for chromium. | |
79 if (skia_support_pdf) { | |
80 gypi_skia_pdf = | |
81 exec_script("//build/gypi_to_gn.py", | |
82 [ | |
83 rebase_path("//third_party/skia/gyp/pdf.gypi"), | |
84 "--replace=<(skia_include_path)=//third_party/skia/include", | |
85 "--replace=<(skia_src_path)=//third_party/skia/src", | |
86 ], | |
87 "scope", | |
88 [ "//third_party/skia/gyp/pdf.gypi" ]) | |
89 } | |
90 | |
91 # The list of Skia effects that are to be set for chromium. | |
92 gypi_skia_effects = | |
93 exec_script("//build/gypi_to_gn.py", | |
94 [ | |
95 rebase_path("//third_party/skia/gyp/effects.gypi"), | |
96 "--replace=<(skia_include_path)=//third_party/skia/include", | |
97 "--replace=<(skia_src_path)=//third_party/skia/src", | |
98 ], | |
99 "scope", | |
100 [ "//third_party/skia/gyp/effects.gypi" ]) | |
101 | |
102 # The list of Skia utils that are to be set for chromium. | |
103 gypi_skia_utils = | |
104 exec_script("//build/gypi_to_gn.py", | |
105 [ | |
106 rebase_path("//third_party/skia/gyp/utils.gypi"), | |
107 "--replace=<(skia_include_path)=//third_party/skia/include", | |
108 "--replace=<(skia_src_path)=//third_party/skia/src", | |
109 ], | |
110 "scope", | |
111 [ "//third_party/skia/gyp/utils.gypi" ]) | |
112 | |
113 gypi_skia_opts = | |
114 exec_script("//build/gypi_to_gn.py", | |
115 [ | |
116 rebase_path("//third_party/skia/gyp/opts.gypi"), | |
117 "--replace=<(skia_include_path)=//third_party/skia/include", | |
118 "--replace=<(skia_src_path)=//third_party/skia/src", | |
119 ], | |
120 "scope", | |
121 [ "//third_party/skia/gyp/opts.gypi" ]) | |
122 | |
123 # The list of Skia files is kept in skia_gn_files.gypi. Read it. | 44 # The list of Skia files is kept in skia_gn_files.gypi. Read it. |
124 gypi_values = | 45 gypi_values = |
125 exec_script("//build/gypi_to_gn.py", | 46 exec_script("//build/gypi_to_gn.py", |
126 [ | 47 [ |
127 rebase_path("skia_gn_files.gypi"), | 48 rebase_path("skia_gn_files.gypi"), |
128 "--replace=<(skia_include_path)=//third_party/skia/include", | 49 "--replace=<(skia_include_path)=//third_party/skia/include", |
129 "--replace=<(skia_src_path)=//third_party/skia/src", | 50 "--replace=<(skia_src_path)=//third_party/skia/src", |
130 ], | 51 ], |
131 "scope", | 52 "scope", |
132 [ "skia_gn_files.gypi" ]) | 53 [ "skia_gn_files.gypi" ]) |
(...skipping 10 matching lines...) Expand all Loading... |
143 "//third_party/skia/include/images", | 64 "//third_party/skia/include/images", |
144 "//third_party/skia/include/lazy", | 65 "//third_party/skia/include/lazy", |
145 "//third_party/skia/include/pathops", | 66 "//third_party/skia/include/pathops", |
146 "//third_party/skia/include/pdf", | 67 "//third_party/skia/include/pdf", |
147 "//third_party/skia/include/pipe", | 68 "//third_party/skia/include/pipe", |
148 "//third_party/skia/include/ports", | 69 "//third_party/skia/include/ports", |
149 "//third_party/skia/include/utils", | 70 "//third_party/skia/include/utils", |
150 ] | 71 ] |
151 | 72 |
152 defines = gypi_chromium_skia_defines.chromium_skia_defines | 73 defines = gypi_chromium_skia_defines.chromium_skia_defines |
153 defines += gypi_skia_defines.skia_for_chromium_defines | 74 defines += skia_for_chromium_defines |
154 | 75 |
155 defines += [] | 76 defines += [] |
156 | 77 |
157 if (skia_build_no_opts) { | 78 if (skia_build_no_opts) { |
158 defines += [ "SK_BUILD_NO_OPTS" ] | 79 defines += [ "SK_BUILD_NO_OPTS" ] |
159 } | 80 } |
160 | 81 |
161 if (is_component_build) { | 82 if (is_component_build) { |
162 defines += [ | 83 defines += [ |
163 "SKIA_DLL", | 84 "SKIA_DLL", |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 if (!is_ios) { | 250 if (!is_ios) { |
330 sources += [ "ext/platform_canvas.cc" ] | 251 sources += [ "ext/platform_canvas.cc" ] |
331 } | 252 } |
332 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) { | 253 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) { |
333 sources += [ "ext/convolver_SSE2.cc" ] | 254 sources += [ "ext/convolver_SSE2.cc" ] |
334 } else if (current_cpu == "mipsel" && mips_dsp_rev >= 2) { | 255 } else if (current_cpu == "mipsel" && mips_dsp_rev >= 2) { |
335 sources += [ "ext/convolver_mips_dspr2.cc" ] | 256 sources += [ "ext/convolver_mips_dspr2.cc" ] |
336 } | 257 } |
337 | 258 |
338 # The skia gypi values are relative to the skia_dir, so we need to rebase. | 259 # The skia gypi values are relative to the skia_dir, so we need to rebase. |
339 sources += gypi_skia_core.sources | 260 sources += skia_core_sources |
340 sources += gypi_skia_effects.sources | 261 sources += skia_effects_sources |
341 sources += gypi_skia_utils.sources | 262 sources += skia_utils_sources |
342 sources += gypi_values.skia_library_sources | 263 sources += gypi_values.skia_library_sources |
343 | 264 |
344 # This and skia_opts are really the same conceptual target so share headers. | 265 # This and skia_opts are really the same conceptual target so share headers. |
345 allow_circular_includes_from = [ ":skia_opts" ] | 266 allow_circular_includes_from = [ ":skia_opts" ] |
346 | 267 |
347 if (current_cpu == "arm") { | 268 if (current_cpu == "arm") { |
348 sources += [ "//third_party/skia/src/core/SkUtilsArm.cpp" ] | 269 sources += [ "//third_party/skia/src/core/SkUtilsArm.cpp" ] |
349 } | 270 } |
350 | 271 |
351 # GPU | 272 # GPU |
352 if (skia_support_gpu) { | 273 if (skia_support_gpu) { |
353 sources += gypi_skia_gpu.skgpu_sources | 274 sources += skia_gpu_sources |
354 sources += gypi_skia_gpu.skgpu_null_gl_sources | 275 sources += skia_null_gpu_sources |
355 } | 276 } |
356 | 277 |
357 # Remove unused util files include in utils.gypi | 278 # Remove unused util files include in utils.gypi |
358 sources -= [ | 279 sources -= [ |
359 "//third_party/skia/src/utils/SkBoundaryPatch.cpp", | 280 "//third_party/skia/src/utils/SkBoundaryPatch.cpp", |
360 "//third_party/skia/src/utils/SkCamera.cpp", | 281 "//third_party/skia/src/utils/SkCamera.cpp", |
361 "//third_party/skia/src/utils/SkDumpCanvas.cpp", | 282 "//third_party/skia/src/utils/SkDumpCanvas.cpp", |
362 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", | 283 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", |
363 "//third_party/skia/src/utils/SkInterpolator.cpp", | 284 "//third_party/skia/src/utils/SkInterpolator.cpp", |
364 "//third_party/skia/src/utils/SkLayer.cpp", | 285 "//third_party/skia/src/utils/SkLayer.cpp", |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 "//third_party/expat", | 424 "//third_party/expat", |
504 "//third_party/freetype-android:freetype", | 425 "//third_party/freetype-android:freetype", |
505 ] | 426 ] |
506 } | 427 } |
507 | 428 |
508 if (skia_support_pdf) { | 429 if (skia_support_pdf) { |
509 deps += [ | 430 deps += [ |
510 "//third_party/sfntly", | 431 "//third_party/sfntly", |
511 "//third_party/zlib", | 432 "//third_party/zlib", |
512 ] | 433 ] |
513 sources += gypi_skia_pdf.sources | 434 sources += skia_pdf_sources |
514 } else { | 435 } else { |
515 sources += [ "//third_party/skia/src/pdf/SkDocument_PDF_None.cpp" ] | 436 sources += [ "//third_party/skia/src/pdf/SkDocument_PDF_None.cpp" ] |
516 } | 437 } |
517 | 438 |
518 if ((is_android || is_win) && !is_debug) { | 439 if ((is_android || is_win) && !is_debug) { |
519 configs -= [ "//build/config/compiler:default_optimization" ] | 440 configs -= [ "//build/config/compiler:default_optimization" ] |
520 configs += [ "//build/config/compiler:optimize_max" ] | 441 configs += [ "//build/config/compiler:optimize_max" ] |
521 } | 442 } |
522 | 443 |
523 if (is_mac) { | 444 if (is_mac) { |
(...skipping 18 matching lines...) Expand all Loading... |
542 | 463 |
543 # SkFontHost_mac.cpp uses API deprecated in iOS 7, crbug.com/408571 | 464 # SkFontHost_mac.cpp uses API deprecated in iOS 7, crbug.com/408571 |
544 cflags = [ "-Wno-deprecated-declarations" ] | 465 cflags = [ "-Wno-deprecated-declarations" ] |
545 } | 466 } |
546 } | 467 } |
547 | 468 |
548 # Separated out so it can be compiled with different flags for SSE. | 469 # Separated out so it can be compiled with different flags for SSE. |
549 if (!skia_build_no_opts) { | 470 if (!skia_build_no_opts) { |
550 if (current_cpu == "arm64") { | 471 if (current_cpu == "arm64") { |
551 source_set("skia_opts_crc32") { | 472 source_set("skia_opts_crc32") { |
552 sources = gypi_skia_opts.crc32_sources | 473 sources = skia_opts.crc32_sources |
553 cflags = [ "-march=armv8-a+crc" ] | 474 cflags = [ "-march=armv8-a+crc" ] |
554 visibility = [ ":skia_opts" ] | 475 visibility = [ ":skia_opts" ] |
555 configs -= [ "//build/config/compiler:chromium_code" ] | 476 configs -= [ "//build/config/compiler:chromium_code" ] |
556 configs += [ | 477 configs += [ |
557 ":skia_config", | 478 ":skia_config", |
558 ":skia_library_config", | 479 ":skia_library_config", |
559 "//build/config/compiler:no_chromium_code", | 480 "//build/config/compiler:no_chromium_code", |
560 ] | 481 ] |
561 } | 482 } |
562 } | 483 } |
563 if (current_cpu == "x86" || current_cpu == "x64") { | 484 if (current_cpu == "x86" || current_cpu == "x64") { |
564 source_set("skia_opts_sse3") { | 485 source_set("skia_opts_sse3") { |
565 sources = gypi_skia_opts.ssse3_sources | 486 sources = skia_opts.ssse3_sources |
566 if (!is_win || is_clang) { | 487 if (!is_win || is_clang) { |
567 cflags = [ "-mssse3" ] | 488 cflags = [ "-mssse3" ] |
568 } | 489 } |
569 if (is_win) { | 490 if (is_win) { |
570 defines = [ "SK_CPU_SSE_LEVEL=31" ] | 491 defines = [ "SK_CPU_SSE_LEVEL=31" ] |
571 } | 492 } |
572 visibility = [ ":skia_opts" ] | 493 visibility = [ ":skia_opts" ] |
573 configs -= [ "//build/config/compiler:chromium_code" ] | 494 configs -= [ "//build/config/compiler:chromium_code" ] |
574 configs += [ | 495 configs += [ |
575 ":skia_config", | 496 ":skia_config", |
576 ":skia_library_config", | 497 ":skia_library_config", |
577 "//build/config/compiler:no_chromium_code", | 498 "//build/config/compiler:no_chromium_code", |
578 ] | 499 ] |
579 } | 500 } |
580 source_set("skia_opts_sse41") { | 501 source_set("skia_opts_sse41") { |
581 sources = gypi_skia_opts.sse41_sources | 502 sources = skia_opts.sse41_sources |
582 if (!is_win || is_clang) { | 503 if (!is_win || is_clang) { |
583 cflags = [ "-msse4.1" ] | 504 cflags = [ "-msse4.1" ] |
584 } | 505 } |
585 if (is_win) { | 506 if (is_win) { |
586 defines = [ "SK_CPU_SSE_LEVEL=41" ] | 507 defines = [ "SK_CPU_SSE_LEVEL=41" ] |
587 } | 508 } |
588 visibility = [ ":skia_opts" ] | 509 visibility = [ ":skia_opts" ] |
589 configs -= [ "//build/config/compiler:chromium_code" ] | 510 configs -= [ "//build/config/compiler:chromium_code" ] |
590 configs += [ | 511 configs += [ |
591 ":skia_config", | 512 ":skia_config", |
592 ":skia_library_config", | 513 ":skia_library_config", |
593 "//build/config/compiler:no_chromium_code", | 514 "//build/config/compiler:no_chromium_code", |
594 ] | 515 ] |
595 } | 516 } |
596 source_set("skia_opts_sse42") { | 517 source_set("skia_opts_sse42") { |
597 sources = gypi_skia_opts.sse42_sources | 518 sources = skia_opts.sse42_sources |
598 if (!is_win || is_clang) { | 519 if (!is_win || is_clang) { |
599 cflags = [ "-msse4.2" ] | 520 cflags = [ "-msse4.2" ] |
600 } | 521 } |
601 if (is_win) { | 522 if (is_win) { |
602 defines = [ "SK_CPU_SSE_LEVEL=42" ] | 523 defines = [ "SK_CPU_SSE_LEVEL=42" ] |
603 } | 524 } |
604 visibility = [ ":skia_opts" ] | 525 visibility = [ ":skia_opts" ] |
605 configs -= [ "//build/config/compiler:chromium_code" ] | 526 configs -= [ "//build/config/compiler:chromium_code" ] |
606 configs += [ | 527 configs += [ |
607 ":skia_config", | 528 ":skia_config", |
608 ":skia_library_config", | 529 ":skia_library_config", |
609 "//build/config/compiler:no_chromium_code", | 530 "//build/config/compiler:no_chromium_code", |
610 ] | 531 ] |
611 } | 532 } |
612 source_set("skia_opts_avx") { | 533 source_set("skia_opts_avx") { |
613 sources = gypi_skia_opts.avx_sources | 534 sources = skia_opts.avx_sources |
614 if (!is_win) { | 535 if (!is_win) { |
615 cflags = [ "-mavx" ] | 536 cflags = [ "-mavx" ] |
616 } | 537 } |
617 if (is_win) { | 538 if (is_win) { |
618 cflags = [ "/arch:AVX" ] | 539 cflags = [ "/arch:AVX" ] |
619 } | 540 } |
620 visibility = [ ":skia_opts" ] | 541 visibility = [ ":skia_opts" ] |
621 configs -= [ "//build/config/compiler:chromium_code" ] | 542 configs -= [ "//build/config/compiler:chromium_code" ] |
622 configs += [ | 543 configs += [ |
623 ":skia_config", | 544 ":skia_config", |
624 ":skia_library_config", | 545 ":skia_library_config", |
625 "//build/config/compiler:no_chromium_code", | 546 "//build/config/compiler:no_chromium_code", |
626 ] | 547 ] |
627 } | 548 } |
628 source_set("skia_opts_avx2") { | 549 source_set("skia_opts_avx2") { |
629 sources = gypi_skia_opts.avx2_sources | 550 sources = skia_opts.avx2_sources |
630 if (!is_win) { | 551 if (!is_win) { |
631 cflags = [ "-mavx2" ] | 552 cflags = [ "-mavx2" ] |
632 } | 553 } |
633 if (is_win) { | 554 if (is_win) { |
634 cflags = [ "/arch:AVX2" ] | 555 cflags = [ "/arch:AVX2" ] |
635 } | 556 } |
636 visibility = [ ":skia_opts" ] | 557 visibility = [ ":skia_opts" ] |
637 configs -= [ "//build/config/compiler:chromium_code" ] | 558 configs -= [ "//build/config/compiler:chromium_code" ] |
638 configs += [ | 559 configs += [ |
639 ":skia_config", | 560 ":skia_config", |
640 ":skia_library_config", | 561 ":skia_library_config", |
641 "//build/config/compiler:no_chromium_code", | 562 "//build/config/compiler:no_chromium_code", |
642 ] | 563 ] |
643 } | 564 } |
644 } | 565 } |
645 } | 566 } |
646 | 567 |
647 source_set("skia_opts") { | 568 source_set("skia_opts") { |
648 cflags = [] | 569 cflags = [] |
649 defines = [] | 570 defines = [] |
650 | 571 |
651 deps = [ | 572 deps = [ |
652 "//base", | 573 "//base", |
653 ] | 574 ] |
654 | 575 |
655 if (skia_build_no_opts) { | 576 if (skia_build_no_opts) { |
656 sources = gypi_skia_opts.none_sources | 577 sources = skia_opts.none_sources |
657 } else if (current_cpu == "x86" || current_cpu == "x64") { | 578 } else if (current_cpu == "x86" || current_cpu == "x64") { |
658 sources = gypi_skia_opts.sse2_sources | 579 sources = skia_opts.sse2_sources |
659 deps += [ | 580 deps += [ |
660 ":skia_opts_avx", | 581 ":skia_opts_avx", |
661 ":skia_opts_avx2", | 582 ":skia_opts_avx2", |
662 ":skia_opts_sse3", | 583 ":skia_opts_sse3", |
663 ":skia_opts_sse41", | 584 ":skia_opts_sse41", |
664 ":skia_opts_sse42", | 585 ":skia_opts_sse42", |
665 ] | 586 ] |
666 } else if (current_cpu == "arm") { | 587 } else if (current_cpu == "arm") { |
667 # The assembly uses the frame pointer register (r7 in Thumb/r11 in | 588 # The assembly uses the frame pointer register (r7 in Thumb/r11 in |
668 # ARM), the compiler doesn't like that. | 589 # ARM), the compiler doesn't like that. |
669 cflags += [ "-fomit-frame-pointer" ] | 590 cflags += [ "-fomit-frame-pointer" ] |
670 | 591 |
671 if (arm_version >= 7) { | 592 if (arm_version >= 7) { |
672 sources = gypi_skia_opts.armv7_sources | 593 sources = skia_opts.armv7_sources |
673 if (arm_use_neon || arm_optionally_use_neon) { | 594 if (arm_use_neon || arm_optionally_use_neon) { |
674 sources += gypi_skia_opts.neon_sources | 595 sources += skia_opts.neon_sources |
675 | 596 |
676 # Root build config sets -mfpu=$arm_fpu, which we expect to be neon | 597 # Root build config sets -mfpu=$arm_fpu, which we expect to be neon |
677 # when running this. | 598 # when running this. |
678 if (!arm_use_neon) { | 599 if (!arm_use_neon) { |
679 configs -= [ "//build/config/compiler:compiler_arm_fpu" ] | 600 configs -= [ "//build/config/compiler:compiler_arm_fpu" ] |
680 cflags += [ "-mfpu=neon" ] | 601 cflags += [ "-mfpu=neon" ] |
681 } | 602 } |
682 } | 603 } |
683 } else { | 604 } else { |
684 sources = gypi_skia_opts.none_sources | 605 sources = skia_opts.none_sources |
685 } | 606 } |
686 } else if (current_cpu == "arm64") { | 607 } else if (current_cpu == "arm64") { |
687 sources = gypi_skia_opts.arm64_sources | 608 sources = skia_opts.arm64_sources |
688 deps += [ ":skia_opts_crc32" ] | 609 deps += [ ":skia_opts_crc32" ] |
689 } else if (current_cpu == "mipsel") { | 610 } else if (current_cpu == "mipsel") { |
690 cflags += [ "-fomit-frame-pointer" ] | 611 cflags += [ "-fomit-frame-pointer" ] |
691 | 612 |
692 if (mips_dsp_rev >= 1) { | 613 if (mips_dsp_rev >= 1) { |
693 sources = gypi_skia_opts.mips_dsp_sources | 614 sources = skia_opts.mips_dsp_sources |
694 } else { | 615 } else { |
695 sources = gypi_skia_opts.none_sources | 616 sources = skia_opts.none_sources |
696 } | 617 } |
697 } else if (current_cpu == "mips64el") { | 618 } else if (current_cpu == "mips64el") { |
698 cflags += [ "-fomit-frame-pointer" ] | 619 cflags += [ "-fomit-frame-pointer" ] |
699 sources = gypi_skia_opts.none_sources | 620 sources = skia_opts.none_sources |
700 } else { | 621 } else { |
701 assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp") | 622 assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp") |
702 } | 623 } |
703 | 624 |
704 if ((is_android || is_win) && !is_debug) { | 625 if ((is_android || is_win) && !is_debug) { |
705 configs -= [ "//build/config/compiler:default_optimization" ] | 626 configs -= [ "//build/config/compiler:default_optimization" ] |
706 configs += [ "//build/config/compiler:optimize_max" ] | 627 configs += [ "//build/config/compiler:optimize_max" ] |
707 } | 628 } |
708 | 629 |
709 configs -= [ "//build/config/compiler:chromium_code" ] | 630 configs -= [ "//build/config/compiler:chromium_code" ] |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
775 | 696 |
776 deps = [ | 697 deps = [ |
777 ":skia", | 698 ":skia", |
778 "//base", | 699 "//base", |
779 "//base/test:test_support", | 700 "//base/test:test_support", |
780 "//build/config/sanitizers:deps", | 701 "//build/config/sanitizers:deps", |
781 "//build/win:default_exe_manifest", | 702 "//build/win:default_exe_manifest", |
782 ] | 703 ] |
783 } | 704 } |
784 } | 705 } |
OLD | NEW |