Revert "Move most .pydeps file to be validated by chromium-presubmit"
This reverts commit d18325929e0b9599ecbde684f902cc31cc3b5e10.
Reason for revert: Broke src-internal rolls
Original change's description:
> Move most .pydeps file to be validated by chromium-presubmit
>
> Bug: None
> Change-Id: I7f3289980e7fbebf1719098b9e6edd2d47b11c3f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2229998
> Auto-Submit: Andrew Grieve <[email protected]>
> Reviewed-by: Mohamed Heikal <[email protected]>
> Commit-Queue: Mohamed Heikal <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#775092}
[email protected],[email protected]
Change-Id: I1992b115088497b7e0bd3a3ca9400a3d0ba962d3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1091265
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2231259
Reviewed-by: Peter Wen <[email protected]>
Commit-Queue: Peter Wen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#775112}
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 3897a53..30bc0f70 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1296,25 +1296,11 @@
)
-# These are not checked on the public chromium-presubmit trybot.
-# Add files here that rely on .py files that exists only for target_os="android"
-# checkouts (e.g. //third_party/catapult).
_ANDROID_SPECIFIC_PYDEPS_FILES = [
'android_webview/tools/run_cts.pydeps',
- 'build/android/devil_chromium.pydeps',
- 'build/android/gyp/create_bundle_wrapper_script.pydeps',
- 'build/android/gyp/jinja_template.pydeps',
- 'build/android/resource_sizes.pydeps',
- 'build/android/test_runner.pydeps',
- 'build/android/test_wrapper/logdog_wrapper.pydeps',
- 'testing/scripts/run_android_wpt.pydeps',
- 'third_party/android_platform/development/scripts/stack.pydeps',
-]
-
-
-_GENERIC_PYDEPS_FILES = [
'base/android/jni_generator/jni_generator.pydeps',
'base/android/jni_generator/jni_registration_generator.pydeps',
+ 'build/android/devil_chromium.pydeps',
'build/android/gyp/aar.pydeps',
'build/android/gyp/aidl.pydeps',
'build/android/gyp/allot_native_libraries.pydeps',
@@ -1327,6 +1313,7 @@
'build/android/gyp/create_apk_operations_script.pydeps',
'build/android/gyp/create_app_bundle_apks.pydeps',
'build/android/gyp/create_app_bundle.pydeps',
+ 'build/android/gyp/create_bundle_wrapper_script.pydeps',
'build/android/gyp/create_java_binary_script.pydeps',
'build/android/gyp/create_size_info_files.pydeps',
'build/android/gyp/desugar.pydeps',
@@ -1342,6 +1329,7 @@
'build/android/gyp/java_cpp_enum.pydeps',
'build/android/gyp/java_cpp_strings.pydeps',
'build/android/gyp/jetify_jar.pydeps',
+ 'build/android/gyp/jinja_template.pydeps',
'build/android/gyp/lint.pydeps',
'build/android/gyp/main_dex_list.pydeps',
'build/android/gyp/merge_manifest.pydeps',
@@ -1354,12 +1342,21 @@
'build/android/gyp/zip.pydeps',
'build/android/incremental_install/generate_android_manifest.pydeps',
'build/android/incremental_install/write_installer_json.pydeps',
+ 'build/android/resource_sizes.pydeps',
+ 'build/android/test_runner.pydeps',
+ 'build/android/test_wrapper/logdog_wrapper.pydeps',
'build/protoc_java.pydeps',
'chrome/android/features/create_stripped_java_factory.pydeps',
- 'chrome/test/chromedriver/log_replay/client_replay_unittest.pydeps',
- 'chrome/test/chromedriver/test/run_py_tests.pydeps',
'components/module_installer/android/module_desc_java.pydeps',
'net/tools/testserver/testserver.pydeps',
+ 'testing/scripts/run_android_wpt.pydeps',
+ 'third_party/android_platform/development/scripts/stack.pydeps',
+]
+
+
+_GENERIC_PYDEPS_FILES = [
+ 'chrome/test/chromedriver/log_replay/client_replay_unittest.pydeps',
+ 'chrome/test/chromedriver/test/run_py_tests.pydeps',
'third_party/blink/renderer/bindings/scripts/build_web_idl_database.pydeps',
'third_party/blink/renderer/bindings/scripts/collect_idl_files.pydeps',
'third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps',
