diff options
| -rw-r--r-- | METADATA | 19 | ||||
| -rw-r--r-- | OWNERS | 3 | ||||
| -rwxr-xr-x | android_merge_from_upstream.sh | 2 | ||||
| l--------- | compiler_wrapper/android_llvm_next_flags.go | 1 |
4 files changed, 22 insertions, 3 deletions
diff --git a/METADATA b/METADATA new file mode 100644 index 00000000..852eef78 --- /dev/null +++ b/METADATA @@ -0,0 +1,19 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update toolchain-utils +# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md + +name: "toolchain-utils" +description: "Various utilities used by the ChromeOS toolchain team." +third_party { + url { + type: GIT + value: "https://chromium.googlesource.com/chromiumos/third_party/toolchain-utils/" + } + version: "2942bd8023e3e0a79ed78fd4fff22c1f961e9f73" + license_type: NOTICE + last_upgrade_date { + year: 2023 + month: 8 + day: 17 + } +} @@ -1,3 +1,2 @@ set noparent - -include OWNERS.toolchain +include toolchain/llvm_android:/OWNERS diff --git a/android_merge_from_upstream.sh b/android_merge_from_upstream.sh index 301ea632..a391979d 100755 --- a/android_merge_from_upstream.sh +++ b/android_merge_from_upstream.sh @@ -13,7 +13,7 @@ local_branch_name="merge_with_upstream" local_upstream="aosp/master" # nocheck remote="aosp" -remote_branch="${remote}/upstream-mirror-master" # nocheck +remote_branch="${remote}/upstream-main" # nocheck my_dir="$(dirname "$(readlink -m "$0")")" cd "${my_dir}" diff --git a/compiler_wrapper/android_llvm_next_flags.go b/compiler_wrapper/android_llvm_next_flags.go new file mode 120000 index 00000000..0abed7b4 --- /dev/null +++ b/compiler_wrapper/android_llvm_next_flags.go @@ -0,0 +1 @@ +../../../toolchain/llvm_android/android_llvm_next_flags.go
\ No newline at end of file |