diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/BUILD.gn | 14 | ||||
| -rw-r--r-- | chrome/android/BUILD.gn | 4 | ||||
| -rw-r--r-- | chrome/chrome_repack_locales.gni | 6 | ||||
| -rw-r--r-- | chrome/renderer/BUILD.gn | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 5b40f4f..8b0e6a3 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -41,6 +41,8 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { if (is_win) { sources += [ "$target_gen_dir/chrome_exe_version.rc", + "//content/app/startup_helper_win.cc", + "//content/public/common/content_switches.cc", "app/chrome_crash_reporter_client.cc", "app/chrome_crash_reporter_client.h", "app/chrome_exe.rc", @@ -55,8 +57,6 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { "app/signature_validator_win.h", "common/crash_keys.cc", "common/crash_keys.h'", - "//content/app/startup_helper_win.cc", - "//content/public/common/content_switches.cc", ] deps += [ ":chrome_version_resources", @@ -408,12 +408,12 @@ if (is_chrome_branded) { copy("default_apps") { visibility = [ ":packed_resources" ] sources = [ + "browser/resources/default_apps/docs.crx", + "browser/resources/default_apps/drive.crx", "browser/resources/default_apps/external_extensions.json", "browser/resources/default_apps/gmail.crx", "browser/resources/default_apps/search.crx", "browser/resources/default_apps/youtube.crx", - "browser/resources/default_apps/drive.crx", - "browser/resources/default_apps/docs.crx", ] outputs = [ "$root_out_dir/default_apps/{{source_file_part}}", @@ -473,12 +473,12 @@ repack("packed_extra_resources") { if (!is_ios && !is_android) { # New paks should be added here by default. sources += [ + "$root_gen_dir/blink/devtools_resources.pak", "$root_gen_dir/chrome/component_extension_resources.pak", "$root_gen_dir/chrome/options_resources.pak", "$root_gen_dir/chrome/quota_internals_resources.pak", "$root_gen_dir/chrome/sync_file_system_internals_resources.pak", "$root_gen_dir/chrome/webrtc_device_provider_resources.pak", - "$root_gen_dir/blink/devtools_resources.pak", ] deps += [ "//chrome/browser/devtools:webrtc_device_provider_resources", @@ -578,10 +578,10 @@ template("chrome_repack_percent") { # All sources should also have deps for completeness. sources = [ - "$root_gen_dir/components/components_resources_${percent}_percent.pak", - "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak", "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak", + "$root_gen_dir/components/components_resources_${percent}_percent.pak", + "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", ] deps = [ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 53a6cd4..9f262e3 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -245,7 +245,6 @@ copy_ex("chrome_shell_assets") { clear_dir = true dest = chrome_shell_assets_dir sources = [ - "$root_build_dir/resources.pak", "$root_build_dir/chrome_100_percent.pak", "$root_build_dir/locales/am.pak", "$root_build_dir/locales/ar.pak", @@ -257,8 +256,8 @@ copy_ex("chrome_shell_assets") { "$root_build_dir/locales/el.pak", "$root_build_dir/locales/en-GB.pak", "$root_build_dir/locales/en-US.pak", - "$root_build_dir/locales/es.pak", "$root_build_dir/locales/es-419.pak", + "$root_build_dir/locales/es.pak", "$root_build_dir/locales/fa.pak", "$root_build_dir/locales/fi.pak", "$root_build_dir/locales/fil.pak", @@ -291,6 +290,7 @@ copy_ex("chrome_shell_assets") { "$root_build_dir/locales/vi.pak", "$root_build_dir/locales/zh-CN.pak", "$root_build_dir/locales/zh-TW.pak", + "$root_build_dir/resources.pak", ] deps = [ "//chrome:packed_resources", diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni index 4f42fad..ea9b432 100644 --- a/chrome/chrome_repack_locales.gni +++ b/chrome/chrome_repack_locales.gni @@ -24,9 +24,9 @@ template("_repack_one_locale") { # Each input pak file should also have a deps line for completeness. sources = [ - "${root_gen_dir}/chrome/platform_locale_settings_${locale}.pak", "${root_gen_dir}/chrome/generated_resources_${locale}.pak", "${root_gen_dir}/chrome/locale_settings_${locale}.pak", + "${root_gen_dir}/chrome/platform_locale_settings_${locale}.pak", "${root_gen_dir}/components/strings/components_strings_${locale}.pak", ] deps = [ @@ -42,8 +42,8 @@ template("_repack_one_locale") { } if (is_chromeos) { sources += [ - "${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak", "${root_gen_dir}/remoting/resources/${locale}.pak", + "${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak", ] deps += [ "//remoting/resources", @@ -53,8 +53,8 @@ template("_repack_one_locale") { if (!is_ios) { sources += [ "${root_gen_dir}/content/app/strings/content_strings_${locale}.pak", - "${root_gen_dir}/ui/strings/ui_strings_${locale}.pak", "${root_gen_dir}/ui/strings/app_locale_settings_${locale}.pak", + "${root_gen_dir}/ui/strings/ui_strings_${locale}.pak", ] deps += [ "//content/app/strings", diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index 20829dd..35637e09 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -122,10 +122,10 @@ static_library("renderer") { ] if (!enable_webrtc) { sources -= [ - "media/cast_rtp_stream.cc", - "media/cast_rtp_stream.h", "media/cast_receiver_session.cc", "media/cast_receiver_session.h", + "media/cast_rtp_stream.cc", + "media/cast_rtp_stream.h", ] } } |