jni_zero: move all python and test code into //third_party/jni_zero
This is as close to a pure `mv` as I could do. No functional changes,
and I haven't brought over anything else from the
//base/android/jni_generator folder.
We plan to develop the re-branded jni_generator from within
//third_party for now.
Bug: 1377351, 1456762
Change-Id: I71a9afe0d62c09003e9afa24582eae5f36f09ccf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4722028
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1181106}
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index bc45fa3..682a6c2 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1677,7 +1677,6 @@
_GENERIC_PYDEPS_FILES = [
'android_webview/test/components/run_webview_component_smoketest.pydeps',
'android_webview/tools/run_cts.pydeps',
- 'base/android/jni_generator/jni_zero.pydeps',
'build/android/apk_operations.pydeps',
'build/android/devil_chromium.pydeps',
'build/android/gyp/aar.pydeps',
@@ -1760,6 +1759,7 @@
'third_party/blink/renderer/bindings/scripts/validate_web_idl.pydeps',
'third_party/blink/tools/blinkpy/web_tests/merge_results.pydeps',
'third_party/blink/tools/merge_web_test_results.pydeps',
+ 'third_party/jni_zero/jni_zero.pydeps',
'tools/binary_size/sizes.pydeps',
'tools/binary_size/supersize.pydeps',
'tools/perf/process_perf_results.pydeps',
@@ -6087,7 +6087,7 @@
if sha1_path not in new_or_added_paths:
missing_sha1.append(sha1_path)
elif not _CheckValidSha1(sha1_path):
- invalid_sha1.append(sha1_path)
+ invalid_sha1.append(sha1_path)
def _CheckScreenshotModified(screenshots_dir, message_id):
sha1_path = input_api.os_path.join(screenshots_dir,
@@ -6095,16 +6095,12 @@
if sha1_path not in new_or_added_paths:
missing_sha1_modified.append(sha1_path)
elif not _CheckValidSha1(sha1_path):
- invalid_sha1.append(sha1_path)
+ invalid_sha1.append(sha1_path)
def _CheckValidSha1(sha1_path):
- return sha1_pattern.search(
- next(
- "\n".join(f.NewContents())
- for f in input_api.AffectedFiles()
- if f.LocalPath() == sha1_path
- )
- )
+ return sha1_pattern.search(
+ next("\n".join(f.NewContents()) for f in input_api.AffectedFiles()
+ if f.LocalPath() == sha1_path))
def _CheckScreenshotRemoved(screenshots_dir, message_id):
sha1_path = input_api.os_path.join(screenshots_dir,
@@ -6948,7 +6944,7 @@
"""Check to make sure the libc++ version matches across deps files."""
# Disable check for changes to sub-repositories.
if input_api.PresubmitLocalPath() != input_api.change.RepositoryRoot():
- return []
+ return []
DEPS_FILES = [ 'DEPS', 'buildtools/deps_revisions.gni' ]
