Chromium Code Reviews| Index: chrome/BUILD.gn |
| diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn |
| index 70dd9a00fd9797a80dd9b8bcc73fa9cb4eb82652..128c360300c34a2c92868e02dcbf01297d1d738c 100644 |
| --- a/chrome/BUILD.gn |
| +++ b/chrome/BUILD.gn |
| @@ -16,7 +16,6 @@ import("//chrome/common/features.gni") |
| import("//chrome/process_version_rc_template.gni") |
| import("//third_party/widevine/cdm/widevine.gni") |
| import("//tools/resources/generate_resource_whitelist.gni") |
| -import("//ui/base/ui_features.gni") |
| import("//v8/gni/v8.gni") |
| if (is_android) { |
| @@ -253,10 +252,7 @@ if (!is_android && !is_mac) { |
| } |
| # These files are used by the installer so we need a public dep. |
| - public_deps += [ |
| - ":packed_extra_resources", |
| - ":packed_resources", |
| - ] |
| + public_deps += [ ":packed_resources" ] |
| deps += [ "//components/startup_metric_utils/browser:lib" ] |
| # Only ChromeOS has precompiled Flash that needs to get copied to the output |
| @@ -739,7 +735,6 @@ if (is_win) { |
| ] |
| public_deps = [ |
| - ":packed_extra_resources", |
| ":packed_resources", |
| "//chrome/app_shim:app_mode_loader", |
| ] |
| @@ -1353,23 +1348,7 @@ chrome_paks("packed_resources") { |
| } |
| } |
| -chrome_extra_paks("packed_extra_resources") { |
| - if (is_mac) { |
| - output_dir = "$root_gen_dir/repack" |
| - copy_data_to_bundle = true |
| - } else { |
| - output_dir = root_out_dir |
| - } |
| - |
| - copy_data_to_bundle = is_mac |
| - if (enable_resource_whitelist_generation) { |
| - repack_whitelist = chrome_resource_whitelist |
| - deps = [ |
| - ":resource_whitelist", |
| - ] |
| - } |
| -} |
| - |
| +# 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.
|
| repack("browser_tests_pak") { |
| sources = [ |
| "$root_gen_dir/chrome/options_test_resources.pak", |