diff options
| author | Joe Baker-Malone <jbakermalone@google.com> | 2019-07-01 14:09:55 -0700 |
|---|---|---|
| committer | Joe Baker-Malone <jbakermalone@google.com> | 2019-09-18 15:51:27 -0700 |
| commit | e4890cbaf0ce0acf52dfb95dccc88bfa91046606 (patch) | |
| tree | f6adb6cfdaddba2fbccf728fa75517b6dbff9cd3 | |
| parent | f12e853847ced6f6ab60fe558ffd7ebdd364a691 (diff) | |
| download | manifest-e4890cbaf0ce0acf52dfb95dccc88bfa91046606.tar.gz | |
Add clang
Since we aren't branching the clang prebuilts we pin to a specific
version in the manifest. This can be updated to any commit from
mirror-aosp-master if need be.
Note that currently there will be an issue using a more recent version
of the windows clang, since in later versions some of the symlinks
we're creating via repo are checked in, and currently when we sync on
rbe symlinks aren't created correctly (though they are created
correctly when added by repo).
Test: none
Bug: 135278528
Change-Id: I8de9a6e801a5797dd9ace895aac05240ef6a8e08
| -rw-r--r-- | default.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/default.xml b/default.xml index 0b604407c..76f6b1d3d 100644 --- a/default.xml +++ b/default.xml @@ -40,6 +40,13 @@ <project path="prebuilts/google-breakpad/darwin-x86" name="platform/prebuilts/google-breakpad/darwin-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,darwin" /> <project path="prebuilts/google-breakpad/linux-x86" name="platform/prebuilts/google-breakpad/linux-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,linux" /> <project path="prebuilts/google-breakpad/windows-x86" name="platform/prebuilts/google-breakpad/windows-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,windows" /> + <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="9f9ac9dcfa9b8b663ecbdf3305fc3ff186f5e85b" upstream="mirror-aosp-master" groups="notdefault,platform-darwin" /> + <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="f8e856556909898bd35ee8eae829437721b5a3db" upstream="mirror-aosp-master" groups="notdefault,platform-linux" /> + <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" revision="3f084e9332a6075735bc701c73a9689ce14e358d" upstream="mirror-aosp-master" groups="notdefault,platform-windows" > + <linkfile src="clang-r353983d/bin/clang.exe" dest="prebuilts/clang/host/windows-x86/clang-r353983d/bin/clang-cl.exe"/> + <linkfile src="clang-r353983d/bin/llvm-ar.exe" dest="prebuilts/clang/host/windows-x86/clang-r353983d/bin/llvm-lib.exe"/> + <linkfile src="clang-r353983d/bin/lld.exe" dest="prebuilts/clang/host/windows-x86/clang-r353983d/bin/link.exe"/> + </project> <project path="prebuilts/libedit/darwin-x86" name="platform/prebuilts/libedit/darwin-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,darwin" /> <project path="prebuilts/libedit/linux-x86" name="platform/prebuilts/libedit/linux-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,linux" /> <project path="prebuilts/libglog/darwin-x86" name="platform/prebuilts/libglog/darwin-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,darwin" /> @@ -66,7 +73,8 @@ <linkfile src="bazel/toplevel.WORKSPACE" dest="WORKSPACE" /> <linkfile src="bazel/sdk/prebuilts.studio.sdk.BUILD" dest="prebuilts/studio/sdk/BUILD" /> <linkfile src="bazel/sdk/prebuilts.studio.sdk.README.md" dest="prebuilts/studio/sdk/README.md" /> - </project> + <linkfile src="bazel/toolchains/darwin/wrapped_ar" dest="prebuilts/clang/studio-extra/wrapped_ar.darwin" /> + </project> <project path="tools/data-binding" name="platform/frameworks/data-binding"/> <project path="tools/dx/dalvik" name="platform/dalvik" /> <project path="tools/external/bazelbuild-rules-kotlin" name="platform/tools/external/bazelbuild-rules-kotlin" /> |