Revert "Import leaf dependencies for mls-rs to AOSP" am: 1ae60632ed
Original change: https://android-review.googlesource.com/c/platform/manifest/+/3042512
Change-Id: Ibaca584f43eb7aba1e41f78fdea9bd5aabd11e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/default.xml b/default.xml
index 9a63183..f78233e 100644
--- a/default.xml
+++ b/default.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
+<!--
+ This branch is a main side branch and is configured to have all project
+ specific rules. When updating this manifest file, please also update the
+ project rule in google3 to ensure new projects get testing.
+ See go/side-branch-testing for details.
+-->
<remote name="aosp"
fetch=".."
@@ -10,7 +16,11 @@
<manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver" />
- <superproject name="platform/superproject/main" remote="aosp"/>
+ <remote name="aospsuperproject"
+ fetch=".."
+ review="https://android-review.googlesource.com/"
+ revision="master-plus-llvm" />
+ <superproject name="platform/superproject" remote="aospsuperproject"/>
<contactinfo bugurl="go/repo-bug" />
<project path="build/make" name="platform/build" groups="pdk" >
@@ -1413,4 +1423,35 @@
changes to a custom manifest. Please keep this marker here and
refrain from making changes on or below it.
-->
+
+
+ <project path="toolchain/binutils" name="toolchain/binutils" />
+ <project path="toolchain/llvm-project" name="toolchain/llvm-project" />
+ <project path="toolchain/llvm_android" name="toolchain/llvm_android" />
+ <project path="toolchain/common" name="toolchain/common" />
+
+ <!-- CMake prebuilts -->
+ <project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1" />
+ <project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1" />
+
+ <!-- Dependencies for lldb -->
+ <project path="external/libedit" name="platform/external/libedit" />
+ <project path="external/swig" name="platform/external/swig" />
+ <project path="toolchain/xz" name="toolchain/xz" />
+ <project path="external/libncurses" name="platform/external/ncurses" />
+
+ <!-- Python prebuilts -->
+ <project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" clone-depth="1" revision="llvm-toolchain" />
+ <project path="prebuilts/python/darwin-x86" name="platform/prebuilts/python/darwin-x86" clone-depth="1" revision="llvm-toolchain" />
+ <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="llvm-toolchain" />
+
+ <!-- Prebuilts (for ease of updating) -->
+ <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" />
+
+ <!-- NDK headers/libraries -->
+ <project path="toolchain/prebuilts/ndk/r25" name="toolchain/prebuilts/ndk/r25" />
+ <project path="toolchain/prebuilts/ndk/r26" name="toolchain/prebuilts/ndk/r26" />
+
+ <!-- riscv64 platform sysroot -->
+ <project path="toolchain/prebuilts/sysroot/platform/riscv64-linux-android" name="toolchain/prebuilts/sysroot/platform/riscv64-linux-android" />
</manifest>
