DO NOT MERGE ANYWHERE - Update tools_r21.1 to use main branch.

Bug: b/289400079 Change-Id: I3c4ecc150875c22ff22af5196845a260cc792574
Merge from master
2025-11-29 09:31:20 +08:00 · 2023-07-31 09:32:08 -07:00 · 2013-03-01 11:31:52 -08:00 · 2013-02-15 17:44:36 -08:00 · 2013-02-12 11:05:55 -08:00 · 2013-01-29 13:10:26 -08:00
2 changed files with 311 additions and 982 deletions
--- a/GLOBAL-PREUPLOAD.cfg
+++ b/GLOBAL-PREUPLOAD.cfg
@@ -1,17 +0,0 @@
-# Settings in here control defaults for `repo upload` checks for all projects
-# listed in the manifest.  Do not turn on things here without first consulting
-# the wider Android team, and make sure you send out a PSA before landing.
-
-[Options]
-ignore_merged_commits = true
-
-[Builtin Hooks]
-commit_msg_test_field = true
-
-[Tool Paths]
-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/clang-format
-git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/git-clang-format
-gofmt = ${REPO_ROOT}/prebuilts/go/${BUILD_OS}/bin/gofmt
-google-java-format = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format
-google-java-format-diff = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format-diff.py
-cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py
--- a/default.xml
+++ b/default.xml
Author	SHA1	Message	Date
Xin Li	5329d48a6e	DO NOT MERGE ANYWHERE - Update tools_r21.1 to use main branch. Bug: b/289400079 Change-Id: I3c4ecc150875c22ff22af5196845a260cc792574	2023-07-31 09:32:08 -07:00
The Android Open Source Project	55bfdc7297	Merge from master	2013-03-01 11:31:52 -08:00
The Android Open Source Project	267981933e	Fork prebuilts/tools for tools_r21.1 Change-Id: I27eb0af1a9b441de4a3413bc680de007e7ec2dda	2013-02-15 17:44:36 -08:00
The Android Open Source Project	bfcee22cbf	Merge from master	2013-02-12 11:05:55 -08:00
The Android Open Source Project	e89cdcd695	Merge from master Change-Id: I1df8c987a43b08a98fb2e0fa30da31bb78ec5efb	2013-01-29 13:10:26 -08:00
The Android Open Source Project	3ef51d6de5	Merge from master Change-Id: I2e206570621ddd5e35cfa9fecc45770f2666c0fd	2013-01-28 10:58:33 -08:00
The Android Open Source Project	9237c06942	Merge from master Change-Id: I1d1d30fad48d8adeace067c0f49b5cb0cca26f27	2013-01-17 09:04:07 -08:00
The Android Open Source Project	6369c5563c	Merge from master Change-Id: Icdbf3d3becc3adaaf621aa23a9c4c834c38d171b	2013-01-08 09:41:04 -08:00
The Android Open Source Project	e68c167fad	Merge from master Change-Id: Ib5ca90f592e4726c6c5040fc87ea6ff0d399175b	2013-01-04 14:16:46 -08:00
The Android Open Source Project	d8948f3e4b	Merge from master Change-Id: Ibf98910ebd0e53d01dba963aa846b6ca813d3714	2012-12-21 11:24:38 -08:00
The Android Open Source Project	33b04d8163	Manifest for tools_r21.1 Change-Id: Ide339fc5d979b4ee1d381d04d168458fe814cf77	2012-12-19 15:18:38 -08:00