diff options
| -rw-r--r-- | METADATA | 3 | ||||
| -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, 6 insertions, 3 deletions
diff --git a/METADATA b/METADATA new file mode 100644 index 00000000..d97975ca --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} @@ -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 7430b8dd..4716a25a 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 |