diff options
author | Stephen Hines <srhines@google.com> | 2017-11-09 00:35:22 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2017-11-09 00:35:22 -0800 |
commit | 59f2dd5a5cdf507889cd9bff474780d8258136b9 (patch) | |
tree | 3d3045a019fe88924f264663d1cf9d7ed72b5f74 | |
parent | 139c840aa8ae35f12b18ac89ae9697d926a20fe7 (diff) | |
download | manifest-59f2dd5a5cdf507889cd9bff474780d8258136b9.tar.gz |
Un-nest projects from toolchain/llvm and switch to symlinks.
The Android manifests don't really expect nested repositories, so we are
un-nesting our LLVM toolchain until the monorepo exists (where
everything is all together anyways). As part of this manifest change, we
also add the proper symlinks for the git projects to other top-level git
projects (i.e. toolchain/llvm/tools/clang -> toolchain/clang).
Test: toolchain/llvm_android/build.py and toolchain/llvm/android/build.py
Change-Id: Ie6b8e10381c05774301357cbb74086705e3bd769
-rw-r--r-- | default.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/default.xml b/default.xml index a412e0559..476003981 100644 --- a/default.xml +++ b/default.xml @@ -13,13 +13,13 @@ <project path="toolchain/binutils" name="toolchain/binutils" /> <project path="toolchain/llvm" name="toolchain/llvm" /> <project path="toolchain/llvm_android" name="toolchain/llvm_android" /> - <project path="toolchain/llvm/tools/clang" name="toolchain/clang" /> - <project path="toolchain/llvm/tools/lld" name="toolchain/lld" /> - <project path="toolchain/llvm/projects/compiler-rt" name="toolchain/compiler-rt" /> - <project path="toolchain/llvm/projects/libcxx" name="toolchain/libcxx" /> - <project path="toolchain/llvm/projects/libcxxabi" name="toolchain/libcxxabi" /> - <project path="toolchain/llvm/projects/openmp" name="toolchain/openmp_llvm" /> - <project path="toolchain/llvm/tools/clang/tools/extra" name="toolchain/clang-tools-extra" /> + <project path="toolchain/clang" name="toolchain/clang" /> + <project path="toolchain/lld" name="toolchain/lld" /> + <project path="toolchain/compiler-rt" name="toolchain/compiler-rt" /> + <project path="toolchain/libcxx" name="toolchain/libcxx" /> + <project path="toolchain/libcxxabi" name="toolchain/libcxxabi" /> + <project path="toolchain/openmp_llvm" name="toolchain/openmp_llvm" /> + <project path="toolchain/clang-tools-extra" name="toolchain/clang-tools-extra" /> <!-- Binutils/gcc toolchains --> <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,darwin,arm" /> |