Przeglądaj źródła

v109 fix remove calling untrusted hooks

Carmelo Messina 2 lat temu
rodzic
commit
6c61862192

+ 14 - 7
build/patches/build-remove-calling-untrusted-hooks.patch

@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -118,7 +118,7 @@ vars = {
+@@ -121,7 +121,7 @@ vars = {
  
    # Check out and download nacl by default, unless on an arm mac.
    # This can be disabled e.g. with custom_vars.
@@ -22,18 +22,25 @@ diff --git a/DEPS b/DEPS
  
    # By default, do not check out src-internal. This can be overridden e.g. with
    # custom_vars.
-@@ -171,8 +171,8 @@ vars = {
+@@ -174,7 +174,7 @@ vars = {
    # support for other platforms may be added in the future.
    'checkout_openxr' : 'checkout_win',
  
--  'checkout_traffic_annotation_tools': 'checkout_configuration != "small"',
 -  'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration != "small"',
-+  'checkout_traffic_annotation_tools': False,
 +  'checkout_instrumented_libraries': False,
  
    # By default bot checkouts the WPR archive files only when this
    # flag is set True.
-@@ -3985,49 +3985,6 @@ hooks = [
+@@ -196,7 +196,7 @@ vars = {
+   #   - workstation.qemu-x64
+   #   Hardware:
+   #   - workstation_eng.chromebook-x64
+-  #   - workstation_eng.chromebook-x64-dfv2 
++  #   - workstation_eng.chromebook-x64-dfv2
+   #
+   # Since the images are hundreds of MB, default to only downloading the image
+   # most commonly useful for developers. Bots and developers that need to use
+@@ -3974,49 +3974,6 @@ hooks = [
          'sync', '--extract',
      ],
    },
@@ -83,7 +90,7 @@ diff --git a/DEPS b/DEPS
    {
      # Case-insensitivity for the Win SDK. Must run before win_toolchain below.
      'name': 'ciopfs_linux',
-@@ -4198,57 +4155,6 @@ hooks = [
+@@ -4188,57 +4145,6 @@ hooks = [
      ],
    },
  
@@ -141,7 +148,7 @@ diff --git a/DEPS b/DEPS
    # Pull rc binaries using checked-in hashes.
    {
      'name': 'rc_win',
-@@ -4274,30 +4180,6 @@ hooks = [
+@@ -4264,30 +4170,6 @@ hooks = [
                  '-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
      ],
    },