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/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") |
| 6 import("//build/config/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") |
| 7 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/locales.gni") | 9 import("//build/config/locales.gni") |
| 10 import("//build/config/sanitizers/sanitizers.gni") | 10 import("//build/config/sanitizers/sanitizers.gni") |
| 11 import("//build/config/ui.gni") | 11 import("//build/config/ui.gni") |
| 12 import("//build/config/win/console_app.gni") | 12 import("//build/config/win/console_app.gni") |
| 13 import("//build/config/win/manifest.gni") | 13 import("//build/config/win/manifest.gni") |
| 14 import("//chrome/chrome_paks.gni") | 14 import("//chrome/chrome_paks.gni") |
| 15 import("//chrome/common/features.gni") | 15 import("//chrome/common/features.gni") |
| 16 import("//chrome/process_version_rc_template.gni") | 16 import("//chrome/process_version_rc_template.gni") |
| 17 import("//third_party/widevine/cdm/widevine.gni") | 17 import("//third_party/widevine/cdm/widevine.gni") |
| 18 import("//tools/resources/generate_resource_whitelist.gni") | 18 import("//tools/resources/generate_resource_whitelist.gni") |
| 19 import("//ui/base/ui_features.gni") | |
| 20 import("//v8/gni/v8.gni") | 19 import("//v8/gni/v8.gni") |
| 21 | 20 |
| 22 if (is_android) { | 21 if (is_android) { |
| 23 import("//build/config/android/rules.gni") | 22 import("//build/config/android/rules.gni") |
| 24 } else if (is_mac) { | 23 } else if (is_mac) { |
| 25 import("//build/compiled_action.gni") | 24 import("//build/compiled_action.gni") |
| 26 import("//build/config/mac/rules.gni") | 25 import("//build/config/mac/rules.gni") |
| 27 import("//build/config/mac/symbols.gni") | 26 import("//build/config/mac/symbols.gni") |
| 28 import("//build/mac/tweak_info_plist.gni") | 27 import("//build/mac/tweak_info_plist.gni") |
| 29 import("//build/util/branding.gni") | 28 import("//build/util/branding.gni") |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 ] | 245 ] |
| 247 } | 246 } |
| 248 | 247 |
| 249 if (enable_package_mash_services) { | 248 if (enable_package_mash_services) { |
| 250 deps += [ "//chrome/app/mash" ] | 249 deps += [ "//chrome/app/mash" ] |
| 251 data_deps += [ "//chrome/app:mojo_manifests" ] | 250 data_deps += [ "//chrome/app:mojo_manifests" ] |
| 252 } | 251 } |
| 253 } | 252 } |
| 254 | 253 |
| 255 # These files are used by the installer so we need a public dep. | 254 # These files are used by the installer so we need a public dep. |
| 256 public_deps += [ | 255 public_deps += [ ":packed_resources" ] |
| 257 ":packed_extra_resources", | |
| 258 ":packed_resources", | |
| 259 ] | |
| 260 deps += [ "//components/startup_metric_utils/browser:lib" ] | 256 deps += [ "//components/startup_metric_utils/browser:lib" ] |
| 261 | 257 |
| 262 # Only ChromeOS has precompiled Flash that needs to get copied to the output | 258 # Only ChromeOS has precompiled Flash that needs to get copied to the output |
| 263 # directory. On other platforms, Flash is either component-updated only or | 259 # directory. On other platforms, Flash is either component-updated only or |
| 264 # not supported at all. | 260 # not supported at all. |
| 265 if (is_chromeos) { | 261 if (is_chromeos) { |
| 266 deps += [ "//third_party/adobe/flash:flapper_binaries" ] | 262 deps += [ "//third_party/adobe/flash:flapper_binaries" ] |
| 267 } | 263 } |
| 268 | 264 |
| 269 data_deps += [ "//third_party/widevine/cdm:widevinecdmadapter" ] | 265 data_deps += [ "//third_party/widevine/cdm:widevinecdmadapter" ] |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 732 # can't deal with .icns files. | 728 # can't deal with .icns files. |
| 733 "app/theme/default_100_percent/$branding_path_component/product_logo_32.pn g", | 729 "app/theme/default_100_percent/$branding_path_component/product_logo_32.pn g", |
| 734 "browser/mac/install.sh", | 730 "browser/mac/install.sh", |
| 735 ] | 731 ] |
| 736 | 732 |
| 737 outputs = [ | 733 outputs = [ |
| 738 "{{bundle_resources_dir}}/{{source_file_part}}", | 734 "{{bundle_resources_dir}}/{{source_file_part}}", |
| 739 ] | 735 ] |
| 740 | 736 |
| 741 public_deps = [ | 737 public_deps = [ |
| 742 ":packed_extra_resources", | |
| 743 ":packed_resources", | 738 ":packed_resources", |
| 744 "//chrome/app_shim:app_mode_loader", | 739 "//chrome/app_shim:app_mode_loader", |
| 745 ] | 740 ] |
| 746 | 741 |
| 747 if (enable_mac_keystone) { | 742 if (enable_mac_keystone) { |
| 748 sources += [ | 743 sources += [ |
| 749 "browser/mac/keystone_promote_postflight.sh", | 744 "browser/mac/keystone_promote_postflight.sh", |
| 750 "browser/mac/keystone_promote_preflight.sh", | 745 "browser/mac/keystone_promote_preflight.sh", |
| 751 ] | 746 ] |
| 752 } | 747 } |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1346 ] | 1341 ] |
| 1347 } | 1342 } |
| 1348 | 1343 |
| 1349 if (is_chrome_branded && !is_mac && !is_android) { | 1344 if (is_chrome_branded && !is_mac && !is_android) { |
| 1350 public_deps = [ | 1345 public_deps = [ |
| 1351 ":default_apps", | 1346 ":default_apps", |
| 1352 ] | 1347 ] |
| 1353 } | 1348 } |
| 1354 } | 1349 } |
| 1355 | 1350 |
| 1356 chrome_extra_paks("packed_extra_resources") { | 1351 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak |
|
brettw
2016/09/20 19:21:32
We shouldn't be adding these GYP annotations any m
agrieve
2016/09/20 19:23:52
Done.
| |
| 1357 if (is_mac) { | |
| 1358 output_dir = "$root_gen_dir/repack" | |
| 1359 copy_data_to_bundle = true | |
| 1360 } else { | |
| 1361 output_dir = root_out_dir | |
| 1362 } | |
| 1363 | |
| 1364 copy_data_to_bundle = is_mac | |
| 1365 if (enable_resource_whitelist_generation) { | |
| 1366 repack_whitelist = chrome_resource_whitelist | |
| 1367 deps = [ | |
| 1368 ":resource_whitelist", | |
| 1369 ] | |
| 1370 } | |
| 1371 } | |
| 1372 | |
| 1373 repack("browser_tests_pak") { | 1352 repack("browser_tests_pak") { |
| 1374 sources = [ | 1353 sources = [ |
| 1375 "$root_gen_dir/chrome/options_test_resources.pak", | 1354 "$root_gen_dir/chrome/options_test_resources.pak", |
| 1376 "$root_gen_dir/chrome/webui_test_resources.pak", | 1355 "$root_gen_dir/chrome/webui_test_resources.pak", |
| 1377 ] | 1356 ] |
| 1378 output = "$root_out_dir/browser_tests.pak" | 1357 output = "$root_out_dir/browser_tests.pak" |
| 1379 deps = [ | 1358 deps = [ |
| 1380 "//chrome/browser/resources:options_test_resources", | 1359 "//chrome/browser/resources:options_test_resources", |
| 1381 "//chrome/test/data:webui_test_resources", | 1360 "//chrome/test/data:webui_test_resources", |
| 1382 ] | 1361 ] |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1547 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1526 "//chrome/app/theme/$branding_path_component/product_logo_48.png", |
| 1548 "//chrome/tools/build/linux/chrome-wrapper", | 1527 "//chrome/tools/build/linux/chrome-wrapper", |
| 1549 "//third_party/xdg-utils/scripts/xdg-mime", | 1528 "//third_party/xdg-utils/scripts/xdg-mime", |
| 1550 "//third_party/xdg-utils/scripts/xdg-settings", | 1529 "//third_party/xdg-utils/scripts/xdg-settings", |
| 1551 ] | 1530 ] |
| 1552 outputs = [ | 1531 outputs = [ |
| 1553 "$root_out_dir/{{source_file_part}}", | 1532 "$root_out_dir/{{source_file_part}}", |
| 1554 ] | 1533 ] |
| 1555 } | 1534 } |
| 1556 } | 1535 } |
| OLD | NEW |