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

Side by Side Diff: sky/engine/platform/BUILD.gn

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 | « sky/engine/core/page/Page.cpp ('k') | sky/engine/platform/graphics/Pattern.cpp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//sky/engine/build/scripts/scripts.gni") 6 import("//sky/engine/build/scripts/scripts.gni")
7 import("//sky/engine/config.gni") 7 import("//sky/engine/config.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 # Most targets in this file are private actions so use that as the default. 10 # Most targets in this file are private actions so use that as the default.
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 "//skia", 608 "//skia",
609 "//sky/engine/wtf", 609 "//sky/engine/wtf",
610 "//third_party/harfbuzz-ng", 610 "//third_party/harfbuzz-ng",
611 "//third_party/iccjpeg", 611 "//third_party/iccjpeg",
612 "//third_party/icu", 612 "//third_party/icu",
613 "//third_party/libpng", 613 "//third_party/libpng",
614 "//third_party/ots", 614 "//third_party/ots",
615 "//third_party/qcms", 615 "//third_party/qcms",
616 "//third_party:jpeg", 616 "//third_party:jpeg",
617 "//url", 617 "//url",
618 "//v8",
619 ] 618 ]
620 619
621 forward_dependent_configs_from = [ 620 forward_dependent_configs_from = [
622 "//gpu/command_buffer/client:gles2_c_lib", 621 "//gpu/command_buffer/client:gles2_c_lib",
623 "//skia", 622 "//skia",
624 "//third_party:jpeg", 623 "//third_party:jpeg",
625 "//third_party/iccjpeg", 624 "//third_party/iccjpeg",
626 "//third_party/libpng", 625 "//third_party/libpng",
627 "//third_party/ots", 626 "//third_party/ots",
628 "//third_party/qcms", 627 "//third_party/qcms",
629 "//url", 628 "//url",
630 "//v8",
631 ] 629 ]
632 630
633 if (is_android) { 631 if (is_android) {
634 # Add in some Linux files also shared with Android. 632 # Add in some Linux files also shared with Android.
635 set_sources_assignment_filter([]) 633 set_sources_assignment_filter([])
636 sources += [ 634 sources += [
637 "exported/linux/WebFontRenderStyle.cpp", 635 "exported/linux/WebFontRenderStyle.cpp",
638 "fonts/linux/FontPlatformDataLinux.cpp", 636 "fonts/linux/FontPlatformDataLinux.cpp",
639 ] 637 ]
640 set_sources_assignment_filter(sources_assignment_filter) 638 set_sources_assignment_filter(sources_assignment_filter)
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 # See https://bugs.webkit.org/show_bug.cgi?id=62916. 731 # See https://bugs.webkit.org/show_bug.cgi?id=62916.
734 # TODO(GYP) 732 # TODO(GYP)
735 #'cflags': ['-marm'], 733 #'cflags': ['-marm'],
736 # 'conditions': [ 734 # 'conditions': [
737 # ['OS=="android"', { 735 # ['OS=="android"', {
738 # 'cflags!': ['-mthumb'], 736 # 'cflags!': ['-mthumb'],
739 # }], 737 # }],
740 # ], 738 # ],
741 } 739 }
742 } 740 }
OLDNEW
« no previous file with comments | « sky/engine/core/page/Page.cpp ('k') | sky/engine/platform/graphics/Pattern.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698