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 bdf6d5865fb0069f4df368613167069d2fb50c86..93a126365406badf911d938dde2dcd8b140b7f6f 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 95b6d2a684fd6cb2655f7bc3a985f113bd2b23b5..3afb802aa6563cf625709bd1ab0b0c7f86b08760 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -4563,7 +4563,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 4a1bba04faf432da83a8d563217469a861ce14a2..4ca8d943e89703e9fada09395e033b75d93d839c 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -7030,9 +7030,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", @@ -7992,6 +7995,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", @@ -8047,7 +8054,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",