| OLD | NEW |
| 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 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 if (is_android) { | 626 if (is_android) { |
| 627 # Add in some Linux files also shared with Android. | 627 # Add in some Linux files also shared with Android. |
| 628 set_sources_assignment_filter([]) | 628 set_sources_assignment_filter([]) |
| 629 sources += [ | 629 sources += [ |
| 630 "exported/linux/WebFontRenderStyle.cpp", | 630 "exported/linux/WebFontRenderStyle.cpp", |
| 631 "fonts/linux/FontPlatformDataLinux.cpp", | 631 "fonts/linux/FontPlatformDataLinux.cpp", |
| 632 ] | 632 ] |
| 633 set_sources_assignment_filter(sources_assignment_filter) | 633 set_sources_assignment_filter(sources_assignment_filter) |
| 634 } | 634 } |
| 635 | 635 |
| 636 if (is_ios) { |
| 637 sources += [ "fonts/ios/FontPlatformDataIOS.cpp" ] |
| 638 } |
| 639 |
| 636 if (is_linux) { | 640 if (is_linux) { |
| 637 direct_dependent_configs = [ "//build/config/linux:fontconfig" ] | 641 direct_dependent_configs = [ "//build/config/linux:fontconfig" ] |
| 638 } | 642 } |
| 639 | 643 |
| 640 if (target_cpu == "arm") { | 644 if (target_cpu == "arm") { |
| 641 deps += [ ":sky_arm_neon" ] | 645 deps += [ ":sky_arm_neon" ] |
| 642 } | 646 } |
| 643 } | 647 } |
| 644 | 648 |
| 645 test("platform_unittests") { | 649 test("platform_unittests") { |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 724 # See https://bugs.webkit.org/show_bug.cgi?id=62916. | 728 # See https://bugs.webkit.org/show_bug.cgi?id=62916. |
| 725 # TODO(GYP) | 729 # TODO(GYP) |
| 726 #'cflags': ['-marm'], | 730 #'cflags': ['-marm'], |
| 727 # 'conditions': [ | 731 # 'conditions': [ |
| 728 # ['OS=="android"', { | 732 # ['OS=="android"', { |
| 729 # 'cflags!': ['-mthumb'], | 733 # 'cflags!': ['-mthumb'], |
| 730 # }], | 734 # }], |
| 731 # ], | 735 # ], |
| 732 } | 736 } |
| 733 } | 737 } |
| OLD | NEW |