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

build_do_not_depend_on_packed_resource_integrity.patch 3.2 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889 
  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 3611378c052813bd9c9ab9ce7d1840d6535576bf..b148e0acaf28197ee1da634b5e4c449ffcc30ddc 100644
    15. 

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

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

  17. @@ -200,11 +200,16 @@ if (!is_android && !is_mac && !is_fuchsia) {
    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 9e7f057a1c35d3e6ba3f144cfaf7dfe0ff1148a8..b2b2c49e745530b35b6ee7df080426afa4c64989 100644
    37. 

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

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

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

  40.  
    41. 

  41.      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
    42. 

  42.      # than here in :chrome_dll.
    43. 

  43. -    if (!is_win) {
    44. 

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

  45.        deps += [ "//chrome:packed_resources_integrity_header" ]
    46. 

  46.        sources += [ "certificate_viewer_stub.cc" ]
    47. 

  47.      }
    48. 

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

  49. index f56b2c37e6176e3d796db6a0d75b9388691a1b1c..4f5b716570e8e235699c90b44ce14b367469e994 100644
    50. 

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

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

  52. @@ -7190,7 +7190,6 @@ if (!is_fuchsia) {
    53. 

  53.  
    54. 

  54.        deps += [
    55. 

  55.          "//chrome:other_version",
    56. 

  56. -        "//chrome:packed_resources_integrity_header",
    57. 

  57.          "//chrome//services/util_win:unit_tests",
    58. 

  58.          "//chrome/app:chrome_dll_resources",
    59. 

  59.          "//chrome/app:win_unit_tests",
    60. 

  60. @@ -7211,6 +7210,10 @@ if (!is_fuchsia) {
    61. 

  61.          "//ui/resources",
    62. 

  62.        ]
    63. 

  63.  
    64. 

  64. +      if (!is_electron_build) {
    65. 

  65. +        deps += [ "//chrome:packed_resources_integrity_header" ]
    66. 

  66. +      }
    67. 

  67. +
    68. 

  68.        ldflags = [
    69. 

  69.          "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
    70. 

  70.          "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
    71. 

  71. @@ -8231,7 +8234,6 @@ if (!is_fuchsia) {
    72. 

  72.        }
    73. 

  73.  
    74. 

  74.        deps += [
    75. 

  75. -        "//chrome:packed_resources_integrity_header",
    76. 

  76.          "//chrome/browser/apps:icon_standardizer",
    77. 

  77.          "//chrome/browser/apps/app_service",
    78. 

  78.          "//chrome/browser/apps/app_service:app_registry_cache_waiter",
    79. 

  79. @@ -8324,6 +8326,10 @@ if (!is_fuchsia) {
    80. 

  80.          "//ui/webui/resources/js/browser_command:mojo_bindings",
    81. 

  81.        ]
    82. 

  82.  
    83. 

  83. +      if (!is_electron_build) {
    84. 

  84. +        deps += [ "//chrome:packed_resources_integrity_header" ]
    85. 

  85. +      }
    86. 

  86. +
    87. 

  87.        data += [ "//ash/components/arc/test/data/icons/" ]
    88. 

  88.  
    89. 

  89.        if (include_js2gtest_tests && is_chromeos_ash) {
    90.