Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 962d8b325a
Branches Tags
electron
/
patches
/
chromium
/
build_do_not_depend_on_packed_resource_integrity.patch

build_do_not_depend_on_packed_resource_integrity.patch 3.1 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Samuel Attard <[email protected]>
    3. 

  3. Date: Thu, 27 May 2021 17:21:07 -0700
    4. 

  4. Subject: build: do not depend on packed_resource_integrity
    5. 

  5. 

  6. This ensures we do not depend on a target that does not exist when
    7. 

  7. building Electron, electron generates its own .pak files via
    8. 

  8. electron_repack and therefore this integrity target which is generated
    9. 

  9. by the chrome_paks target does not exist.  This can not be upstreamed,
    10. 

  10. if we ever align our .pak file generation with Chrome we can remove this
    11. 

  11. patch.
    12. 

  12. 

  13. diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
    14. 

  14. index b38442f018b218944c7b85c9f8bd8b8eb6137b9e..dd15f6cf5dc40f2d54134c833d35508f2e22967b 100644
    15. 

  15. --- a/chrome/BUILD.gn
    16. 

  16. +++ b/chrome/BUILD.gn
    17. 

  17. @@ -199,11 +199,16 @@ if (!is_android && !is_mac) {
    18. 

  18.          "common/crash_keys.h",
    19. 

  19.        ]
    20. 

  20.  
    21. 

  21. +      if (!is_electron_build) {
    22. 

  22. +        deps = [
    23. 

  23. +          ":packed_resources_integrity_header",
    24. 

  24. +        ]
    25. 

  25. +      }
    26. 

  26. +
    27. 

  27.        deps += [
    28. 

  28.          ":chrome_dll",
    29. 

  29.          ":chrome_exe_version",
    30. 

  30.          ":copy_first_run",
    31. 

  31. -        ":packed_resources_integrity_header",
    32. 

  32.          ":visual_elements_resources",
    33. 

  33.          "//base",
    34. 

  34.          "//build:branding_buildflags",
    35. 

  35. diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    36. 

  36. index 0fe770a6446f6732c99f2e27eab2eeab746e550f..76e76e51fd9c0af7b244fc51e7d4d2cb3a649508 100644
    37. 

  37. --- a/chrome/browser/BUILD.gn
    38. 

  38. +++ b/chrome/browser/BUILD.gn
    39. 

  39. @@ -4565,7 +4565,7 @@ static_library("browser") {
    40. 

  40.            [ "//chrome/browser/ui/webui/signin:profile_impl" ]
    41. 

  41.      }
    42. 

  42.  
    43. 

  43. -    if (!is_win) {
    44. 

  44. +    if (!is_win && !is_electron_build) {
    45. 

  45.        # On Windows, the hashes are embedded in //chrome:chrome_initial rather
    46. 

  46.        # than here in :chrome_dll.
    47. 

  47.        deps += [ "//chrome:packed_resources_integrity_header" ]
    48. 

  48. diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
    49. 

  49. index 7f79aa298e29f4abd1f7fb4a25b4497082cdb315..d1e4732ac13129e6fd2521446dac6d3b7814dfe8 100644
    50. 

  50. --- a/chrome/test/BUILD.gn
    51. 

  51. +++ b/chrome/test/BUILD.gn
    52. 

  52. @@ -7034,9 +7034,12 @@ test("unit_tests") {
    53. 

  53.        "//chrome/notification_helper",
    54. 

  54.      ]
    55. 

  55.  
    56. 

  56. +    if (!is_electron_build) {
    57. 

  57. +      deps += [ "//chrome:packed_resources_integrity_header" ]
    58. 

  58. +    }
    59. 

  59. +
    60. 

  60.      deps += [
    61. 

  61.        "//chrome:other_version",
    62. 

  62. -      "//chrome:packed_resources_integrity_header",
    63. 

  63.        "//chrome//services/util_win:unit_tests",
    64. 

  64.        "//chrome/app:chrome_dll_resources",
    65. 

  65.        "//chrome/app:win_unit_tests",
    66. 

  66. @@ -7999,6 +8002,10 @@ test("unit_tests") {
    67. 

  67.        "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
    68. 

  68.      ]
    69. 

  69.  
    70. 

  70. +    if (!is_electron_build) {
    71. 

  71. +      deps += [ "//chrome:packed_resources_integrity_header" ]
    72. 

  72. +    }
    73. 

  73. +
    74. 

  74.      sources += [
    75. 

  75.        # The importer code is not used on Android.
    76. 

  76.        "../common/importer/firefox_importer_utils_unittest.cc",
    77. 

  77. @@ -8054,7 +8061,6 @@ test("unit_tests") {
    78. 

  78.      # Non-android deps for "unit_tests" target.
    79. 

  79.      deps += [
    80. 

  80.        "../browser/screen_ai:screen_ai_install_state",
    81. 

  81. -      "//chrome:packed_resources_integrity_header",
    82. 

  82.        "//chrome/browser/apps:icon_standardizer",
    83. 

  83.        "//chrome/browser/apps/app_service",
    84. 

  84.        "//chrome/browser/apps/app_service:app_registry_cache_waiter",
    85.