From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 27 May 2021 17:21:07 -0700 Subject: build: do not depend on packed_resource_integrity This ensures we do not depend on a target that does not exist when building Electron, electron generates its own .pak files via electron_repack and therefore this integrity target which is generated by the chrome_paks target does not exist. This can not be upstreamed, if we ever align our .pak file generation with Chrome we can remove this patch. diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 3973c5f5889b987410c116ac0f75b29df979d5b2..1215b1ea6c98e5dd9c661e392ef564626629cad5 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -196,11 +196,16 @@ if (!is_android && !is_mac) { "common/crash_keys.h", ] + if (!is_electron_build) { + deps = [ + ":packed_resources_integrity_header", + ] + } + deps += [ ":chrome_dll", ":chrome_exe_version", ":copy_first_run", - ":packed_resources_integrity_header", ":visual_elements_resources", "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 78103d77874650347f367818488a6845c6230e72..4124318730e8e686e968dcfc97af197e7f0e47e0 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -4542,7 +4542,7 @@ static_library("browser") { [ "//chrome/browser/ui/webui/signin:profile_impl" ] } - if (!is_win) { + if (!is_win && !is_electron_build) { # On Windows, the hashes are embedded in //chrome:chrome_initial rather # than here in :chrome_dll. deps += [ "//chrome:packed_resources_integrity_header" ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index d3ecec0092f76a25a74d3d3255d5e6aaa4415106..2197307d6bdf07daaf397890e63a9e7c27d53254 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -7007,9 +7007,12 @@ test("unit_tests") { "//chrome/notification_helper", ] + if (!is_electron_build) { + deps += [ "//chrome:packed_resources_integrity_header" ] + } + deps += [ "//chrome:other_version", - "//chrome:packed_resources_integrity_header", "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", @@ -7968,6 +7971,10 @@ test("unit_tests") { "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", ] + if (!is_electron_build) { + deps += [ "//chrome:packed_resources_integrity_header" ] + } + sources += [ # The importer code is not used on Android. "../common/importer/firefox_importer_utils_unittest.cc", @@ -8023,7 +8030,6 @@ test("unit_tests") { # Non-android deps for "unit_tests" target. deps += [ "../browser/screen_ai:screen_ai_install_state", - "//chrome:packed_resources_integrity_header", "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service:app_registry_cache_waiter",