diff options
| author | Stephen Hines <srhines@google.com> | 2017-06-08 00:42:59 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2017-06-08 00:42:59 -0700 |
| commit | c024e4ab62f81a8e29fa6d032e600e6a163e8265 (patch) | |
| tree | 6753ac905c0aee6b59d7dc001b04c36fa5251425 | |
| parent | 4f6d3ffd837289839701060c010b7511a1ebde25 (diff) | |
| download | manifest-c024e4ab62f81a8e29fa6d032e600e6a163e8265.tar.gz | |
Move entire toolchain underneath toolchain/ dir.
This change also adds a symlink for the top-level llvm/ directory, so
that we don't break our automated builds. Once we switch the automated
builds to use toolchain/llvm as the base directory for executing the
build script, we can delete the symlink rule.
Bug: http://b/28196329
Test: Checked out and built toolchain with this manifest.
Change-Id: I7aafaa0cad25df90846831827ab8141ad60d2ec5
| -rw-r--r-- | default.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/default.xml b/default.xml index 882fc5f96..e23d4fdc5 100644 --- a/default.xml +++ b/default.xml @@ -10,13 +10,15 @@ <!-- Core LLVM toolchain components --> <project path="bionic" name="platform/bionic" /> - <project path="llvm" name="toolchain/llvm" /> - <project path="llvm/tools/clang" name="toolchain/clang" /> - <project path="llvm/projects/compiler-rt" name="toolchain/compiler-rt" /> - <project path="llvm/projects/libcxx" name="toolchain/libcxx" /> - <project path="llvm/projects/libcxxabi" name="toolchain/libcxxabi" /> - <project path="llvm/projects/openmp" name="toolchain/openmp_llvm" /> - <project path="llvm/tools/clang/tools/extra" name="toolchain/clang-tools-extra" /> + <project path="toolchain/llvm" name="toolchain/llvm"> + <linkfile dest="llvm" src="."/> + </project> + <project path="toolchain/llvm/tools/clang" name="toolchain/clang" /> + <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" /> <!-- 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" /> |