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

Side by Side Diff: content/shell/BUILD.gn

Issue 2181043003: Fix GN build on mac with icu_use_data_file = false (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/config/win/console_app.gni") 8 import("//build/config/win/console_app.gni")
9 import("//build/config/win/manifest.gni") 9 import("//build/config/win/manifest.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
11 import("//mojo/public/tools/bindings/mojom.gni") 11 import("//mojo/public/tools/bindings/mojom.gni")
12 import("//tools/grit/repack.gni") 12 import("//tools/grit/repack.gni")
13 import("//tools/grit/grit_rule.gni") 13 import("//tools/grit/grit_rule.gni")
14 if (is_android) { 14 if (is_android) {
15 import("//build/config/android/config.gni") 15 import("//build/config/android/config.gni")
16 } else if (is_mac) { 16 } else if (is_mac) {
17 import("//build/config/mac/rules.gni") 17 import("//build/config/mac/rules.gni")
18 import("//build/mac/tweak_info_plist.gni") 18 import("//build/mac/tweak_info_plist.gni")
19 import("//third_party/icu/config.gni")
19 import("//v8/gni/v8.gni") 20 import("//v8/gni/v8.gni")
20 } else if (is_win) { 21 } else if (is_win) {
21 import("//build/win/syzygy/syzygy.gni") 22 import("//build/win/syzygy/syzygy.gni")
22 } 23 }
23 24
24 declare_args() { 25 declare_args() {
25 content_shell_product_name = "Content Shell" 26 content_shell_product_name = "Content Shell"
26 content_shell_version = "99.77.34.5" 27 content_shell_version = "99.77.34.5"
27 } 28 }
28 29
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 sources = [ 566 sources = [
566 "app/English.lproj/HttpAuth.xib", 567 "app/English.lproj/HttpAuth.xib",
567 "app/English.lproj/MainMenu.xib", 568 "app/English.lproj/MainMenu.xib",
568 ] 569 ]
569 output_path = "{{bundle_resources_dir}}/English.lproj" 570 output_path = "{{bundle_resources_dir}}/English.lproj"
570 } 571 }
571 572
572 bundle_data("content_shell_framework_resources") { 573 bundle_data("content_shell_framework_resources") {
573 sources = [ 574 sources = [
574 "$root_out_dir/content_shell.pak", 575 "$root_out_dir/content_shell.pak",
575 "$root_out_dir/icudtl.dat",
576 "resources/missingImage.png", 576 "resources/missingImage.png",
577 "resources/textAreaResizeCorner.png", 577 "resources/textAreaResizeCorner.png",
578 ] 578 ]
579 if (icu_use_data_file) {
580 sources += [ "$root_out_dir/icudtl.dat" ]
581 }
579 582
580 public_deps = [ 583 public_deps = [
581 ":pak", 584 ":pak",
582 ] 585 ]
583 586
584 deps = [ 587 deps = [
585 "//third_party/icu:icudata", 588 "//third_party/icu:icudata",
586 ] 589 ]
587 590
Robert Sesek 2016/07/25 22:33:44 Same.
jungshik at Google 2016/07/26 00:15:18 Done.
588 if (v8_use_external_startup_data) { 591 if (v8_use_external_startup_data) {
589 sources += [ 592 sources += [
590 "$root_out_dir/natives_blob.bin", 593 "$root_out_dir/natives_blob.bin",
591 "$root_out_dir/snapshot_blob.bin", 594 "$root_out_dir/snapshot_blob.bin",
592 ] 595 ]
593 public_deps += [ "//v8" ] 596 public_deps += [ "//v8" ]
594 } 597 }
595 598
596 outputs = [ 599 outputs = [
597 "{{bundle_resources_dir}}/{{source_file_part}}", 600 "{{bundle_resources_dir}}/{{source_file_part}}",
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 } 743 }
741 } 744 }
742 745
743 mojom("mojo_bindings") { 746 mojom("mojo_bindings") {
744 sources = [ 747 sources = [
745 "common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom", 748 "common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom",
746 ] 749 ]
747 750
748 use_new_wrapper_types = false 751 use_new_wrapper_types = false
749 } 752 }
OLDNEW
« chrome/BUILD.gn ('K') | « chrome/BUILD.gn ('k') | remoting/host/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698