Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 7e59d784a0
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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990 
  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 a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0fea2b6f0e 100644
    15. 

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

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

  17. @@ -171,11 +171,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",
    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",
    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 fca255a2cd49f1f5d2bcb4418b04355c5befba38..2a0f3edc10a7ba48ee5a0efac0a6053f62b184e0 100644
    37. 

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

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

  39. @@ -4508,7 +4508,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" ]
    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 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a197ae638 100644
    50. 

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

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

  52. @@ -5904,7 +5904,6 @@ test("unit_tests") {
    53. 

  53.  
    54. 

  54.      deps += [
    55. 

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

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

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

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

  59.        "//chrome/browser:chrome_process_finder",
    60. 

  60. @@ -5927,6 +5926,10 @@ test("unit_tests") {
    61. 

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

  62.      ]
    63. 

  63.  
    64. 

  64. +    if (!is_electron_build) {
    65. 

  65. +      deps += [ "//chrome:packed_resources_integrity" ]
    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. @@ -6616,7 +6619,6 @@ test("unit_tests") {
    72. 

  72.      }
    73. 

  73.  
    74. 

  74.      deps += [
    75. 

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

  76.        "//chrome/browser:cart_db_content_proto",
    77. 

  77.        "//chrome/browser:coupon_db_content_proto",
    78. 

  78.        "//chrome/browser/media/router:test_support",
    79. 

  79. @@ -6662,6 +6664,11 @@ test("unit_tests") {
    80. 

  80.        "//ui/native_theme:test_support",
    81. 

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

  82.      ]
    83. 

  83. +
    84. 

  84. +    if (!is_electron_build) {
    85. 

  85. +      deps += [ "//chrome:packed_resources_integrity_hash" ]
    86. 

  86. +    }
    87. 

  87. +
    88. 

  88.      if (is_chromeos_ash) {
    89. 

  89.        deps += [
    90. 

  90.          "//ash/assistant/model",
    91.