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

build_do_not_depend_on_packed_resource_integrity.patch 2.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768 
  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 8e07f7000de932bc9b6bf484b1a9fce4d4580b4a..eac65b694c0a0857f73f75228b8d673bdfcd2b93 100644
    15. 

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

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

  17. @@ -172,11 +172,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 a7b5475c29acff9032ceb28f1237c4901559deba..db2b9ea0a08d6dc72afc67b305f628eb2ad67a38 100644
    37. 

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

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

  39. @@ -4277,7 +4277,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.      }
    47. 

  47.  
    48. 

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

  49. index d5f3e36ccf1aad7a88424befeed9d7be59cb4ad5..7a0809f33c376154720e204b1b0456bc59b341b7 100644
    50. 

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

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

  52. @@ -5025,10 +5025,15 @@ test("unit_tests") {
    53. 

  53.      assert(toolkit_views)
    54. 

  54.      sources += [ "../browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc" ]
    55. 

  55.      deps += [
    56. 

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

  57.        "//chrome/browser/win/conflicts:unit_tests",
    58. 

  58.        "//chrome/test:credential_provider_test_utils",
    59. 

  59.      ]
    60. 

  60. +
    61. 

  61. +    if (!is_electron_build) {
    62. 

  62. +      deps += [
    63. 

  63. +        "//chrome:packed_resources_integrity",
    64. 

  64. +      ]
    65. 

  65. +    }
    66. 

  66.    }
    67. 

  67.  
    68. 

  68.    if (is_win || is_chromeos_ash || is_mac) {
    69.