diff options
| -rw-r--r-- | default.xml | 69 |
1 files changed, 62 insertions, 7 deletions
diff --git a/default.xml b/default.xml index 9a6318380..101a16a84 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" > @@ -156,6 +166,7 @@ <project path="external/bazelbuild-rules_python" name="platform/external/bazelbuild-rules_python" groups="pdk" /> <project path="external/bazelbuild-rules_rust" name="platform/external/bazelbuild-rules_rust" groups="pdk" /> <project path="external/bazelbuild-rules_testing" name="platform/external/bazelbuild-rules_testing" groups="pdk" /> + <project path="external/bazelbuild-remote-apis" name="platform/external/bazelbuild-remote-apis" groups="pdk,tradefed" /> <project path="external/bazel-skylib" name="platform/external/bazel-skylib" groups="pdk" /> <project path="external/bc" name="platform/external/bc" groups="pdk" /> <project path="external/bcc" name="platform/external/bcc" groups="pdk" /> @@ -239,6 +250,7 @@ <project path="external/glide" name="platform/external/glide" groups="pdk" /> <project path="external/go-cmp" name="platform/external/go-cmp" groups="pdk" /> <project path="external/golang-protobuf" name="platform/external/golang-protobuf" groups="pdk" /> + <project path="external/googleapis" name="platform/external/googleapis" groups="pdk,tradefed" /> <project path="external/google-benchmark" name="platform/external/google-benchmark" groups="pdk" /> <project path="external/google-breakpad" name="platform/external/google-breakpad" groups="pdk-fs" /> <project path="external/google-fonts/arbutus-slab" name="platform/external/google-fonts/arbutus-slab" groups="pdk" /> @@ -538,6 +550,7 @@ <project path="external/rust/crates/bytemuck_derive" name="platform/external/rust/crates/bytemuck_derive" groups="pdk" /> <project path="external/rust/crates/byteorder" name="platform/external/rust/crates/byteorder" groups="pdk" /> <project path="external/rust/crates/bytes" name="platform/external/rust/crates/bytes" groups="pdk" /> + <project path="external/rust/crates/camino" name="platform/external/rust/crates/camino" groups="pdk" /> <project path="external/rust/crates/cast" name="platform/external/rust/crates/cast" groups="pdk" /> <project path="external/rust/crates/cesu8" name="platform/external/rust/crates/cesu8" groups="pdk" /> <project path="external/rust/crates/cexpr" name="platform/external/rust/crates/cexpr" groups="pdk" /> @@ -568,8 +581,12 @@ <project path="external/rust/crates/crossbeam-utils" name="platform/external/rust/crates/crossbeam-utils" groups="pdk" /> <project path="external/rust/crates/csv" name="platform/external/rust/crates/csv" groups="pdk" /> <project path="external/rust/crates/csv-core" name="platform/external/rust/crates/csv-core" groups="pdk" /> + <project path="external/rust/crates/darling" name="platform/external/rust/crates/darling" groups="pdk" /> + <project path="external/rust/crates/darling_core" name="platform/external/rust/crates/darling_core" groups="pdk" /> + <project path="external/rust/crates/darling_macro" name="platform/external/rust/crates/darling_macro" groups="pdk" /> <project path="external/rust/crates/dashmap" name="platform/external/rust/crates/dashmap" groups="pdk" /> <project path="external/rust/crates/data-encoding" name="platform/external/rust/crates/data-encoding" groups="pdk" /> + <project path="external/rust/crates/debug_tree" name="platform/external/rust/crates/debug_tree" groups="pdk" /> <project path="external/rust/crates/der" name="platform/external/rust/crates/der" groups="pdk" /> <project path="external/rust/crates/der_derive" name="platform/external/rust/crates/der_derive" groups="pdk" /> <project path="external/rust/crates/derive_arbitrary" name="platform/external/rust/crates/derive_arbitrary" groups="pdk" /> @@ -595,6 +612,7 @@ <project path="external/rust/crates/foreign-types-shared" name="platform/external/rust/crates/foreign-types-shared" groups="pdk" /> <project path="external/rust/crates/form_urlencoded" name="platform/external/rust/crates/form_urlencoded" groups="pdk" /> <project path="external/rust/crates/fragile" name="platform/external/rust/crates/fragile" groups="pdk" /> + <project path="external/rust/crates/fs-err" name="platform/external/rust/crates/fs-err" groups="pdk" /> <project path="external/rust/crates/futures" name="platform/external/rust/crates/futures" groups="pdk" /> <project path="external/rust/crates/futures-channel" name="platform/external/rust/crates/futures-channel" groups="pdk" /> <project path="external/rust/crates/futures-core" name="platform/external/rust/crates/futures-core" groups="pdk" /> @@ -625,6 +643,7 @@ <project path="external/rust/crates/hex" name="platform/external/rust/crates/hex" groups="pdk" /> <project path="external/rust/crates/http" name="platform/external/rust/crates/http" groups="pdk" /> <project path="external/rust/crates/httparse" name="platform/external/rust/crates/httparse" groups="pdk" /> + <project path="external/rust/crates/ident_case" name="platform/external/rust/crates/ident_case" groups="pdk" /> <project path="external/rust/crates/idna" name="platform/external/rust/crates/idna" groups="pdk" /> <project path="external/rust/crates/indexmap" name="platform/external/rust/crates/indexmap" groups="pdk" /> <project path="external/rust/crates/ini" name="platform/external/rust/crates/ini" groups="pdk" /> @@ -656,6 +675,7 @@ <project path="external/rust/crates/macaddr" name="platform/external/rust/crates/macaddr" groups="pdk" /> <project path="external/rust/crates/managed" name="platform/external/rust/crates/managed" groups="pdk" /> <project path="external/rust/crates/matches" name="platform/external/rust/crates/matches" groups="trusty" /> + <project path="external/rust/crates/maybe-async" name="platform/external/rust/crates/maybe-async" groups="pdk" /> <project path="external/rust/crates/memchr" name="platform/external/rust/crates/memchr" groups="pdk" /> <project path="external/rust/crates/memmap2" name="platform/external/rust/crates/memmap2" groups="pdk" /> <project path="external/rust/crates/memoffset" name="platform/external/rust/crates/memoffset" groups="pdk" /> @@ -665,6 +685,10 @@ <project path="external/rust/crates/miette-derive" name="platform/external/rust/crates/miette-derive" groups="pdk" /> <project path="external/rust/crates/minimal-lexical" name="platform/external/rust/crates/minimal-lexical" groups="pdk" /> <project path="external/rust/crates/mio" name="platform/external/rust/crates/mio" groups="pdk" /> + <project path="external/rust/crates/mls-rs" name="platform/external/rust/crates/mls-rs" groups="pdk" /> + <project path="external/rust/crates/mls-rs-codec" name="platform/external/rust/crates/mls-rs-codec" groups="pdk" /> + <project path="external/rust/crates/mls-rs-codec-derive" name="platform/external/rust/crates/mls-rs-codec-derive" groups="pdk" /> + <project path="external/rust/crates/mls-rs-core" name="platform/external/rust/crates/mls-rs-core" groups="pdk" /> <project path="external/rust/crates/mockall" name="platform/external/rust/crates/mockall" groups="pdk" /> <project path="external/rust/crates/mockall_derive" name="platform/external/rust/crates/mockall_derive" groups="pdk" /> <project path="external/rust/crates/moveit" name="platform/external/rust/crates/moveit" groups="pdk" /> @@ -679,9 +703,8 @@ <project path="external/rust/crates/num_cpus" name="platform/external/rust/crates/num_cpus" groups="pdk" /> <project path="external/rust/crates/octets" name="platform/external/rust/crates/octets" groups="pdk" /> <project path="external/rust/crates/once_cell" name="platform/external/rust/crates/once_cell" groups="pdk" /> + <project path="external/rust/crates/oneshot-uniffi" name="platform/external/rust/crates/oneshot-uniffi" groups="pdk" /> <project path="external/rust/crates/oorandom" name="platform/external/rust/crates/oorandom" groups="pdk" /> - <project path="external/rust/crates/openmls" name="platform/external/rust/crates/openmls" groups="pdk" /> - <project path="external/rust/crates/openmls_traits" name="platform/external/rust/crates/openmls_traits" groups="pdk" /> <project path="external/rust/crates/openssl" name="platform/external/rust/crates/openssl" groups="pdk" /> <project path="external/rust/crates/openssl-macros" name="platform/external/rust/crates/openssl-macros" groups="pdk" /> <project path="external/rust/crates/os_str_bytes" name="platform/external/rust/crates/os_str_bytes" groups="pdk" /> @@ -765,6 +788,7 @@ <project path="external/rust/crates/spin" name="platform/external/rust/crates/spin" groups="pdk" /> <project path="external/rust/crates/spki" name="platform/external/rust/crates/spki" groups="pdk" /> <project path="external/rust/crates/static_assertions" name="platform/external/rust/crates/static_assertions" groups="pdk" /> + <project path="external/rust/crates/strsim" name="platform/external/rust/crates/strsim" groups="pdk" /> <project path="external/rust/crates/strum" name="platform/external/rust/crates/strum" groups="pdk" /> <project path="external/rust/crates/strum_macros" name="platform/external/rust/crates/strum_macros" groups="pdk" /> <project path="external/rust/crates/syn" name="platform/external/rust/crates/syn" groups="pdk" /> @@ -782,8 +806,6 @@ <project path="external/rust/crates/tinytemplate" name="platform/external/rust/crates/tinytemplate" groups="pdk" /> <project path="external/rust/crates/tinyvec" name="platform/external/rust/crates/tinyvec" groups="pdk" /> <project path="external/rust/crates/tinyvec_macros" name="platform/external/rust/crates/tinyvec_macros" groups="pdk" /> - <project path="external/rust/crates/tls_codec" name="platform/external/rust/crates/tls_codec" groups="pdk" /> - <project path="external/rust/crates/tls_codec_derive" name="platform/external/rust/crates/tls_codec_derive" groups="pdk" /> <project path="external/rust/crates/tokio" name="platform/external/rust/crates/tokio" groups="pdk" /> <project path="external/rust/crates/tokio-macros" name="platform/external/rust/crates/tokio-macros" groups="pdk" /> <project path="external/rust/crates/tokio-stream" name="platform/external/rust/crates/tokio-stream" groups="pdk" /> @@ -805,6 +827,9 @@ <project path="external/rust/crates/unicode-segmentation" name="platform/external/rust/crates/unicode-segmentation" groups="pdk" /> <project path="external/rust/crates/unicode-width" name="platform/external/rust/crates/unicode-width" groups="pdk" /> <project path="external/rust/crates/unicode-xid" name="platform/external/rust/crates/unicode-xid" groups="pdk" /> + <project path="external/rust/crates/uniffi_checksum_derive" name="platform/external/rust/crates/uniffi_checksum_derive" groups="pdk" /> + <project path="external/rust/crates/uniffi_core" name="platform/external/rust/crates/uniffi_core" groups="pdk" /> + <project path="external/rust/crates/uniffi_meta" name="platform/external/rust/crates/uniffi_meta" groups="pdk" /> <project path="external/rust/crates/unsafe-libyaml" name="platform/external/rust/crates/unsafe-libyaml" groups="pdk" /> <project path="external/rust/crates/untrusted" name="platform/external/rust/crates/untrusted" groups="pdk" /> <project path="external/rust/crates/url" name="platform/external/rust/crates/url" groups="pdk" /> @@ -1063,6 +1088,7 @@ <project path="kernel/tests" name="kernel/tests" groups="vts,pdk" /> <project path="libcore" name="platform/libcore" groups="pdk" /> <project path="libnativehelper" name="platform/libnativehelper" groups="pdk" /> + <project path="packages/apps/AvatarPicker" name="platform/packages/apps/AvatarPicker" groups="pdk-fs" /> <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="pdk-cw-fs,pdk-fs" /> <project path="packages/apps/Browser2" name="platform/packages/apps/Browser2" groups="pdk-fs" /> <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="pdk-fs" /> @@ -1224,11 +1250,9 @@ <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="darwin,pdk,tradefed" clone-depth="1" /> <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="linux,pdk,tradefed" clone-depth="1" /> <project path="prebuilts/gradle-plugin" name="platform/prebuilts/gradle-plugin" groups="pdk,pdk-cw-fs,pdk-fs" clone-depth="1" /> - <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" groups="pdk" clone-depth="1" /> <project path="prebuilts/jdk/jdk17" name="platform/prebuilts/jdk/jdk17" groups="pdk" clone-depth="1" /> <project path="prebuilts/jdk/jdk21" name="platform/prebuilts/jdk/jdk21" groups="pdk" clone-depth="1" /> <project path="prebuilts/jdk/jdk8" name="platform/prebuilts/jdk/jdk8" groups="pdk" clone-depth="1" /> - <project path="prebuilts/jdk/jdk9" name="platform/prebuilts/jdk/jdk9" groups="pdk" clone-depth="1" /> <project path="prebuilts/manifest-merger" name="platform/prebuilts/manifest-merger" groups="pdk" clone-depth="1" /> <project path="prebuilts/maven_repo/bumptech" name="platform/prebuilts/maven_repo/bumptech" groups="pdk-cw-fs,pdk-fs" clone-depth="1" /> <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="pdk" clone-depth="1" /> @@ -1413,4 +1437,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> |