Browse Source

Synchronize tarball and clone lists

Blaise 1 month ago
parent
commit
81efc51f4f
5 changed files with 7 additions and 48 deletions
  1. 1 1
      devutils/update_lists.py
  2. 0 28
      domain_substitution.list
  3. 0 18
      pruning.list
  4. 4 0
      utils/clone.py
  5. 2 1
      utils/prune_binaries.py

+ 1 - 1
devutils/update_lists.py

@@ -102,7 +102,7 @@ DOMAIN_EXCLUDE_PREFIXES = [
     'net/http/transport_security_state_static.json',
     'net/http/transport_security_state_static_pins.json',
     # Exclusions for Visual Studio Project generation with GN (PR #445)
-    'tools/gn/src/gn/visual_studio_writer.cc',
+    'tools/gn/',
     # Exclusions for files covered with other patches/unnecessary
     'components/search_engines/prepopulated_engines.json',
     'third_party/blink/renderer/core/dom/document.cc',

+ 0 - 28
domain_substitution.list

@@ -14595,34 +14595,6 @@ tools/fuchsia/3pp/test-scripts/3pp/fetch.py
 tools/generate_stubs/generate_stubs.py
 tools/get_asan_chrome/get_asan_chrome.py
 tools/git/suggest_owners.py
-tools/gn/bootstrap/bootstrap.py
-tools/gn/infra/recipe_modules/macos_sdk/__init__.py
-tools/gn/infra/recipes.py
-tools/gn/infra/recipes/gn.expected/ci_linux.json
-tools/gn/infra/recipes/gn.expected/ci_mac.json
-tools/gn/infra/recipes/gn.expected/ci_win.json
-tools/gn/infra/recipes/gn.expected/cipd_exists.json
-tools/gn/infra/recipes/gn.expected/cipd_register.json
-tools/gn/infra/recipes/gn.expected/cq_linux.json
-tools/gn/infra/recipes/gn.expected/cq_mac.json
-tools/gn/infra/recipes/gn.expected/cq_win.json
-tools/gn/infra/recipes/gn.py
-tools/gn/misc/vim/gn-format.py
-tools/gn/roll_gn.py
-tools/gn/src/base/command_line.cc
-tools/gn/src/base/files/file_util_posix.cc
-tools/gn/src/base/files/file_util_win.cc
-tools/gn/src/base/memory/scoped_refptr.h
-tools/gn/src/base/values.h
-tools/gn/src/base/win/registry.cc
-tools/gn/src/base/win/registry.h
-tools/gn/src/gn/command_gen.cc
-tools/gn/src/gn/compile_commands_writer.h
-tools/gn/src/gn/standard_out.cc
-tools/gn/src/gn/xcode_object.h
-tools/gn/src/util/build_config.h
-tools/gn/src/util/semaphore.cc
-tools/gn/src/util/semaphore.h
 tools/grit/PRESUBMIT.py
 tools/grit/grit/format/chrome_messages_json.py
 tools/grit/grit/format/rc.py

+ 0 - 18
pruning.list

@@ -14407,24 +14407,6 @@ third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.3/tests/gen/sparse
 third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.3/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
 third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.12/tests/fst/xid_continue.fst
 third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.12/tests/fst/xid_start.fst
-third_party/screen-ai/linux/resources/aksara/aksara_page_layout_analysis_ti_rpn_gro.binarypb
-third_party/screen-ai/linux/resources/gocr/gocr_models/line_recognition_mobile_convnext320/Latn_ctc/optical/assets.extra/LabelMap.pb
-third_party/screen-ai/linux/resources/gocr/gocr_models/line_recognition_mobile_convnext320/Latn_ctc/optical/model.fb
-third_party/screen-ai/linux/resources/gocr/gocr_models/line_recognition_mobile_convnext320/Latn_ctc_cpu.binarypb
-third_party/screen-ai/linux/resources/gocr/gocr_models/line_recognition_mobile_convnext320/tflite_langid.tflite
-third_party/screen-ai/linux/resources/gocr/layout/cluster_sort_custom_ops/model.tflite
-third_party/screen-ai/linux/resources/gocr/layout/line_splitting_custom_ops/model.tflite
-third_party/screen-ai/linux/resources/libchromescreenai.so
-third_party/screen-ai/linux/resources/screen2x_model.tflite
-third_party/screen-ai/linux/resources/taser/detector/region_proposal_text_detector_tflite_vertical_mbv2_v1.bincfg
-third_party/screen-ai/linux/resources/taser/detector/rpn_text_detector_mobile_space_to_depth_quantized_mbv2_v1.tflite
-third_party/screen-ai/linux/resources/taser/rpn_text_detection_tflite_mobile_mbv2.binarypb
-third_party/screen-ai/linux/resources/taser/segmenter/tflite_script_detector_0.3.bincfg
-third_party/screen-ai/linux/resources/taser/segmenter/tflite_script_detector_0.3.conv_model
-third_party/screen-ai/linux/resources/taser/segmenter/tflite_script_detector_0.3.lstm_model
-third_party/screen-ai/linux/resources/taser/taser_script_identification_tflite_mobile.binarypb
-third_party/screen-ai/linux/resources/taser_tflite_gocrlatinconvnext320_mbv2_scriptid_aksara_layout_gro_mobile_engine_ti.binarypb
-third_party/screen-ai/linux/resources/taser_tflite_gocrlatinconvnext320_mbv2_scriptid_aksara_layout_gro_mobile_recognizer.binarypb
 third_party/skia/demos.skia.org/demos/mesh2d/canvaskit.wasm
 third_party/skia/modules/canvaskit/tests/assets/Roboto-Regular.otf
 third_party/skia/modules/canvaskit/tests/assets/red_line.skp

+ 4 - 0
utils/clone.py

@@ -17,6 +17,7 @@ from stat import S_IWRITE
 from subprocess import run
 
 from _common import add_common_params, get_chromium_version, get_logger
+from prune_binaries import CONTINGENT_PATHS
 
 # Config file for gclient
 # Instances of 'src' replaced with UC_OUT, which will be replaced with the output directory
@@ -226,6 +227,9 @@ def clone(args):
             (args.output / 'v8' / 'test' / 'torque' / 'test-torque.tq'),
         )
         keep_suffix = ('.gn', '.gni', '.grd', '.gyp', '.isolate', '.pydeps')
+        # Include Contingent Paths
+        for cpath in CONTINGENT_PATHS:
+            remove_dirs += (args.output / Path(cpath), )
         for remove_dir in remove_dirs:
             for path in sorted(remove_dir.rglob('*'), key=lambda l: len(str(l)), reverse=True):
                 if path.is_file() and path not in keep_files and path.suffix not in keep_suffix:

+ 2 - 1
utils/prune_binaries.py

@@ -31,10 +31,11 @@ CONTINGENT_PATHS = (
     'third_party/dawn/tools/golang/',
     'third_party/depot_tools/external_bin/',
     'third_party/devtools-frontend/src/third_party/esbuild/',
-    'third_party/google-java-format/'
+    'third_party/google-java-format/',
     'third_party/libei/',
     'third_party/llvm-build-tools/',
     'third_party/ninja/',
+    'third_party/screen-ai/',
     'third_party/siso/',
     'third_party/updater/chrome_linux64/',
     'third_party/updater/chromium_linux64/',