aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Demeulenaere <jdemeulenaere@google.com>2023-02-28 13:12:18 +0000
committerJordan Demeulenaere <jdemeulenaere@google.com>2023-03-01 09:31:16 +0000
commit3ac28026c164649467a17e8f11f0948658d9bd43 (patch)
treeced2b6b6f4be4dd216185ae75572a4af9b3b27a7
parenta56945eb52ea48e7a58f036f10b732459941de9b (diff)
downloadktfmt-3ac28026c164649467a17e8f11f0948658d9bd43.tar.gz
This CL adds the prebuilt of ktfmt 0.43 to external/ktfmt/ and uses it when formatting Kotlin files. This prebuilts was picked from http://ab/9645412 and will be the same as the one built in http://aosp/2455068. See b/266197805#comment6 for details on why this prebuilt is checked-in outside of the prebuilts/build-tools/ folder. Bug: 266197805 Test: Manual Change-Id: I8bc7ef777e5d6263b868778a8720688e563a2c2b Merged-In: I473f48c9785585c8ce7263a7a47869bc61c0c953
-rw-r--r--ktfmt.jarbin0 -> 56589292 bytes
-rwxr-xr-xktfmt.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/ktfmt.jar b/ktfmt.jar
new file mode 100644
index 0000000..4d39e41
--- /dev/null
+++ b/ktfmt.jar
Binary files differ
diff --git a/ktfmt.py b/ktfmt.py
index 7d93d36..0443795 100755
--- a/ktfmt.py
+++ b/ktfmt.py
@@ -96,7 +96,7 @@ def main():
ktfmt_args += kt_files
dir = os.path.normpath(os.path.dirname(__file__))
- ktfmt_jar = args.jar if args.jar else os.path.join(dir, '../../prebuilts/build-tools/common/framework/ktfmt.jar')
+ ktfmt_jar = args.jar if args.jar else os.path.join(dir, 'ktfmt.jar')
ktlint_env = os.environ.copy()
ktlint_env['JAVA_CMD'] = 'java'