Chromium Code Reviews| 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//components/nacl/nacl_defines.gni") | 8 import("//components/nacl/nacl_defines.gni") |
| 9 import("//tools/grit/grit_rule.gni") | 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which |
| 10 # produces a conflict for the "grit" template so we have to only include one. | |
|
jamesr
2014/09/15 05:50:22
this doesn't seem right, but it's needed to build.
cjhopman
2014/09/15 17:23:07
I had to do the same thing in //net. I definitely
brettw
2014/09/15 18:11:10
This is already fixed but I haven't pushed the new
| |
| 11 if (is_android) { | |
| 12 import("//build/config/android/rules.gni") | |
| 13 } else { | |
| 14 import("//tools/grit/grit_rule.gni") | |
| 15 } | |
| 10 | 16 |
| 11 about_credits_file = "$target_gen_dir/about_credits.html" | 17 about_credits_file = "$target_gen_dir/about_credits.html" |
| 12 additional_modules_list_file = | 18 additional_modules_list_file = |
| 13 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" | 19 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" |
| 14 | 20 |
| 15 gypi_values = exec_script( | 21 gypi_values = exec_script( |
| 16 "//build/gypi_to_gn.py", | 22 "//build/gypi_to_gn.py", |
| 17 [ rebase_path("../chrome_browser.gypi") ], | 23 [ rebase_path("../chrome_browser.gypi") ], |
| 18 "scope", | 24 "scope", |
| 19 [ "../chrome_browser.gypi" ]) | 25 [ "../chrome_browser.gypi" ]) |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 "//components/invalidation", | 67 "//components/invalidation", |
| 62 "//components/metrics:net", | 68 "//components/metrics:net", |
| 63 "//components/metrics/proto:proto", | 69 "//components/metrics/proto:proto", |
| 64 "//components/navigation_metrics", | 70 "//components/navigation_metrics", |
| 65 "//components/network_time", | 71 "//components/network_time", |
| 66 "//components/omaha_query_params", | 72 "//components/omaha_query_params", |
| 67 "//components/omnibox", | 73 "//components/omnibox", |
| 68 "//components/os_crypt", | 74 "//components/os_crypt", |
| 69 "//components/password_manager/core/browser", | 75 "//components/password_manager/core/browser", |
| 70 "//components/password_manager/core/common", | 76 "//components/password_manager/core/common", |
| 71 "//components/pdf/browser", | |
| 72 "//components/policy:policy_component", | 77 "//components/policy:policy_component", |
| 73 "//components/precache/core", | 78 "//components/precache/core", |
| 74 "//components/query_parser", | 79 "//components/query_parser", |
| 75 "//components/rappor", | 80 "//components/rappor", |
| 76 "//components/renderer_context_menu", | 81 "//components/renderer_context_menu", |
| 77 "//components/search", | 82 "//components/search", |
| 78 "//components/search_engines", | 83 "//components/search_engines", |
| 79 "//components/search_provider_logos", | 84 "//components/search_provider_logos", |
| 80 "//components/signin/core/browser", | 85 "//components/signin/core/browser", |
| 81 "//components/startup_metric_utils", | 86 "//components/startup_metric_utils", |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 255 deps += [ "//third_party/hunspell" ] | 260 deps += [ "//third_party/hunspell" ] |
| 256 } | 261 } |
| 257 if (enable_nacl) { | 262 if (enable_nacl) { |
| 258 sources += rebase_path(gypi_values.chrome_browser_nacl_sources, | 263 sources += rebase_path(gypi_values.chrome_browser_nacl_sources, |
| 259 ".", "//chrome") | 264 ".", "//chrome") |
| 260 #deps += [ "//components/nacl:nacl_browser" ] TODO(GYP) | 265 #deps += [ "//components/nacl:nacl_browser" ] TODO(GYP) |
| 261 } | 266 } |
| 262 # ["debug_devtools==1", { TODO(GYP) | 267 # ["debug_devtools==1", { TODO(GYP) |
| 263 # "defines": [ | 268 # "defines": [ |
| 264 # "DEBUG_DEVTOOLS=1", | 269 # "DEBUG_DEVTOOLS=1", |
| 265 # ], | 270 # }], |
| 266 if (enable_configuration_policy) { | 271 if (enable_configuration_policy) { |
| 267 sources += rebase_path( | 272 sources += rebase_path( |
| 268 gypi_values.chrome_browser_policy_shared_with_ios_sources, | 273 gypi_values.chrome_browser_policy_shared_with_ios_sources, |
| 269 ".", "//chrome") | 274 ".", "//chrome") |
| 270 deps += [ | 275 deps += [ |
| 271 "//components/policy", | 276 "//components/policy", |
| 272 "//components/policy/proto", | 277 "//components/policy/proto", |
| 273 ] | 278 ] |
| 274 if (!is_ios) { | 279 if (!is_ios) { |
| 275 sources += rebase_path( | 280 sources += rebase_path( |
| 276 gypi_values.chrome_browser_policy_non_ios_sources, | 281 gypi_values.chrome_browser_policy_non_ios_sources, |
| 277 ".", "//chrome") | 282 ".", "//chrome") |
| 278 } | 283 } |
| 279 if (!is_chromeos) { | 284 if (!is_chromeos) { |
| 280 sources += rebase_path( | 285 sources += rebase_path( |
| 281 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources , | 286 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources , |
| 282 ".", "//chrome") | 287 ".", "//chrome") |
| 283 } | 288 } |
| 284 if (is_win || is_mac || is_desktop_linux) { | 289 if (is_win || is_mac || is_desktop_linux) { |
| 285 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources, | 290 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources, |
| 286 ".", "//chrome") | 291 ".", "//chrome") |
| 287 } | 292 } |
| 288 if (is_android || is_ios) { | 293 if (!is_android && !is_ios) { # Non-mobile |
| 289 sources += rebase_path(gypi_values.chrome_browser_mobile_sources, | |
| 290 ".", "//chrome") | |
| 291 } else { # Non-mobile | |
| 292 deps += [ | 294 deps += [ |
| 293 "//chrome/browser/policy:path_parser", | 295 "//chrome/browser/policy:path_parser", |
| 294 ] | 296 ] |
| 295 } | 297 } |
| 296 } else { | 298 } else { |
| 297 # Configuration policy disabled. | 299 # Configuration policy disabled. |
| 298 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources, | 300 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources, |
| 299 ".", "//chrome") | 301 ".", "//chrome") |
| 300 } | 302 } |
| 301 | 303 |
| 302 if (enable_plugins) { | 304 if (enable_plugins) { |
| 303 sources += rebase_path(gypi_values.chrome_browser_plugins_sources, | 305 sources += rebase_path(gypi_values.chrome_browser_plugins_sources, |
| 304 ".", "//chrome") | 306 ".", "//chrome") |
| 305 deps += [ | 307 deps += [ |
| 308 "//components/pdf/browser", | |
| 306 "//ppapi:ppapi_ipc", | 309 "//ppapi:ppapi_ipc", |
| 307 "//third_party/adobe/flash:flapper_version_h", | 310 "//third_party/adobe/flash:flapper_version_h", |
| 308 ] | 311 ] |
| 309 } | 312 } |
| 310 if (safe_browsing_mode != 0) { | 313 if (safe_browsing_mode != 0) { |
| 311 sources += rebase_path( | 314 sources += rebase_path( |
| 312 gypi_values.chrome_browser_basic_safe_browsing_sources, | 315 gypi_values.chrome_browser_basic_safe_browsing_sources, |
| 313 ".", "//chrome") | 316 ".", "//chrome") |
| 314 deps += [ | 317 deps += [ |
| 315 "//chrome/browser/safe_browsing:chunk_proto", | 318 "//chrome/browser/safe_browsing:chunk_proto", |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 451 deps += [ | 454 deps += [ |
| 452 "//device/core", | 455 "//device/core", |
| 453 "//device/usb", | 456 "//device/usb", |
| 454 ] | 457 ] |
| 455 } | 458 } |
| 456 | 459 |
| 457 if (is_android) { | 460 if (is_android) { |
| 458 sources += rebase_path(gypi_values.chrome_browser_android_sources, | 461 sources += rebase_path(gypi_values.chrome_browser_android_sources, |
| 459 ".", "//chrome") | 462 ".", "//chrome") |
| 460 deps += [ | 463 deps += [ |
| 464 ":jni_headers", | |
| 461 "//components/cdm/browser", | 465 "//components/cdm/browser", |
| 462 #"../components/components.gyp:web_contents_delegate_android", TODO(GYP) | 466 #"../components/components.gyp:web_contents_delegate_android", TODO(GYP) |
| 463 #"chrome_browser_jni_headers", TODO(GYP) | |
| 464 ] | 467 ] |
| 465 deps -= [ | 468 deps -= [ |
| 466 "//third_party/libaddressinput", | 469 "//third_party/libaddressinput", |
| 467 "//components/feedback", | 470 "//components/feedback", |
| 468 "//components/storage_monitor", | 471 "//components/storage_monitor", |
| 469 "//components/web_modal", | 472 "//components/web_modal", |
| 470 ] | 473 ] |
| 471 } else { | 474 } else { |
| 472 sources += rebase_path(gypi_values.chrome_browser_non_android_sources, | 475 sources += rebase_path(gypi_values.chrome_browser_non_android_sources, |
| 473 ".", "//chrome") | 476 ".", "//chrome") |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 608 if (is_win || is_mac) { | 611 if (is_win || is_mac) { |
| 609 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows | 612 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows |
| 610 # and Mac, so this test is meaningless. Can we merge these lists? | 613 # and Mac, so this test is meaningless. Can we merge these lists? |
| 611 sources += rebase_path( | 614 sources += rebase_path( |
| 612 gypi_values.chrome_browser_win_mac_wifi_bootstrapping_sources, | 615 gypi_values.chrome_browser_win_mac_wifi_bootstrapping_sources, |
| 613 ".", "//chrome") | 616 ".", "//chrome") |
| 614 } | 617 } |
| 615 } | 618 } |
| 616 } | 619 } |
| 617 | 620 |
| 621 if (is_android) { | |
| 622 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers | |
| 623 generate_jni("jni_headers") { | |
| 624 sources = rebase_path( | |
| 625 gypi_values.chrome_browser_jni_sources, ".", "//chrome") | |
| 626 jni_package = "chrome" | |
| 627 } | |
| 628 } | |
| 629 | |
| 618 # GYP version: chrome/chrome_resources.gyp:chrome_resources | 630 # GYP version: chrome/chrome_resources.gyp:chrome_resources |
| 619 # (generate_browser_resources action) | 631 # (generate_browser_resources action) |
| 620 grit("resources") { | 632 grit("resources") { |
| 621 source = "browser_resources.grd" | 633 source = "browser_resources.grd" |
| 622 output_dir = "$root_gen_dir/chrome" | 634 output_dir = "$root_gen_dir/chrome" |
| 623 outputs = [ | 635 outputs = [ |
| 624 "grit/browser_resources.h", | 636 "grit/browser_resources.h", |
| 625 "browser_resources.pak", | 637 "browser_resources.pak", |
| 626 ] | 638 ] |
| 627 | 639 |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 773 ] | 785 ] |
| 774 | 786 |
| 775 forward_dependent_configs_from = [ | 787 forward_dependent_configs_from = [ |
| 776 ":browser", | 788 ":browser", |
| 777 "//chrome/browser/ui:test_support", | 789 "//chrome/browser/ui:test_support", |
| 778 ] | 790 ] |
| 779 | 791 |
| 780 if (!is_ios) { | 792 if (!is_ios) { |
| 781 deps += [ | 793 deps += [ |
| 782 "//components/sessions:test_support", | 794 "//components/sessions:test_support", |
| 795 "//google_apis:test_support", | |
| 796 ] | |
| 797 } | |
| 798 | |
| 799 if (enable_extensions) { | |
| 800 deps += [ | |
| 783 "//extensions:test_support", | 801 "//extensions:test_support", |
| 784 "//google_apis:test_support", | |
| 785 ] | 802 ] |
| 786 } | 803 } |
| 787 | 804 |
| 788 if (is_chromeos) { | 805 if (is_chromeos) { |
| 789 sources += [ | 806 sources += [ |
| 790 "chromeos/app_mode/fake_cws.cc", | 807 "chromeos/app_mode/fake_cws.cc", |
| 791 "chromeos/app_mode/fake_cws.h", | 808 "chromeos/app_mode/fake_cws.h", |
| 792 "chromeos/file_manager/fake_disk_mount_manager.cc", | 809 "chromeos/file_manager/fake_disk_mount_manager.cc", |
| 793 "chromeos/file_manager/fake_disk_mount_manager.h", | 810 "chromeos/file_manager/fake_disk_mount_manager.h", |
| 794 "chromeos/input_method/mock_candidate_window_controller.cc", | 811 "chromeos/input_method/mock_candidate_window_controller.cc", |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 906 ] | 923 ] |
| 907 } | 924 } |
| 908 | 925 |
| 909 if (enable_wifi_bootstrapping) { | 926 if (enable_wifi_bootstrapping) { |
| 910 sources += [ | 927 sources += [ |
| 911 "local_discovery/wifi/mock_wifi_manager.cc", | 928 "local_discovery/wifi/mock_wifi_manager.cc", |
| 912 "local_discovery/wifi/mock_wifi_manager.h", | 929 "local_discovery/wifi/mock_wifi_manager.h", |
| 913 ] | 930 ] |
| 914 } | 931 } |
| 915 } | 932 } |
| OLD | NEW |