diff options
| -rw-r--r-- | GLOBAL-PREUPLOAD.cfg | 3 | ||||
| -rw-r--r-- | OWNERS | 2 | ||||
| -rw-r--r-- | default.xml | 40 |
3 files changed, 34 insertions, 11 deletions
diff --git a/GLOBAL-PREUPLOAD.cfg b/GLOBAL-PREUPLOAD.cfg index 04cf58280..5d3cbf5d1 100644 --- a/GLOBAL-PREUPLOAD.cfg +++ b/GLOBAL-PREUPLOAD.cfg @@ -16,5 +16,4 @@ git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bi gofmt = ${REPO_ROOT}/prebuilts/go/${BUILD_OS}/bin/gofmt google-java-format = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format google-java-format-diff = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format-diff.py -rustfmt = ${REPO_ROOT}/prebuilts/rust/${BUILD_OS}/stable/rustfmt -aidl-format = ${REPO_ROOT}/system/tools/aidl/aidl-format.sh +cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py @@ -9,4 +9,4 @@ ipalant@google.com amithds@google.com #{LAST_RESORT_SUGGESTION} baligh@google.com #{LAST_RESORT_SUGGESTION} edheyl@google.com #{LAST_RESORT_SUGGESTION} -samccone@google.com #{LAST_RESORT_SUGGESTION} +samccone@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file diff --git a/default.xml b/default.xml index 24ed2aa94..e64bcfcbf 100644 --- a/default.xml +++ b/default.xml @@ -10,7 +10,7 @@ <manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver" /> - <superproject name="platform/superproject/main" remote="aosp"/> + <superproject name="platform/superproject" remote="aosp" revision="master-plus-rust" /> <contactinfo bugurl="go/repo-bug" /> <project path="build/make" name="platform/build" groups="pdk" > @@ -156,6 +156,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" /> @@ -601,6 +602,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" /> @@ -634,14 +636,12 @@ <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" /> <project path="external/rust/crates/instant" name="platform/external/rust/crates/instant" groups="pdk" /> <project path="external/rust/crates/intrusive-collections" name="platform/external/rust/crates/intrusive-collections" groups="pdk" /> <project path="external/rust/crates/itertools" name="platform/external/rust/crates/itertools" groups="pdk" /> <project path="external/rust/crates/itoa" name="platform/external/rust/crates/itoa" groups="pdk" /> <project path="external/rust/crates/jni" name="platform/external/rust/crates/jni" groups="pdk" /> <project path="external/rust/crates/jni-sys" name="platform/external/rust/crates/jni-sys" groups="pdk" /> - <project path="external/rust/crates/json5" name="platform/external/rust/crates/json5" groups="pdk" /> <project path="external/rust/crates/kernlog" name="platform/external/rust/crates/kernlog" groups="pdk" /> <project path="external/rust/crates/lazy_static" name="platform/external/rust/crates/lazy_static" groups="pdk" /> <project path="external/rust/crates/lazycell" name="platform/external/rust/crates/lazycell" groups="pdk" /> @@ -693,8 +693,6 @@ <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" /> @@ -747,7 +745,6 @@ <project path="external/rust/crates/remain" name="platform/external/rust/crates/remain" groups="pdk" /> <project path="external/rust/crates/remove_dir_all" name="platform/external/rust/crates/remove_dir_all" groups="pdk" /> <project path="external/rust/crates/ring" name="platform/external/rust/crates/ring" groups="pdk" /> - <project path="external/rust/crates/ron" name="platform/external/rust/crates/ron" groups="pdk" /> <project path="external/rust/crates/rusqlite" name="platform/external/rust/crates/rusqlite" groups="pdk" /> <project path="external/rust/crates/rustc-demangle" name="platform/external/rust/crates/rustc-demangle" groups="pdk" /> <project path="external/rust/crates/rustc-demangle-capi" name="platform/external/rust/crates/rustc-demangle-capi" groups="pdk" /> @@ -796,8 +793,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" /> @@ -1429,4 +1424,33 @@ changes to a custom manifest. Please keep this marker here and refrain from making changes on or below it. --> + + <!-- Rust Toolchain Components --> + <project path="toolchain/rustc" name="toolchain/rustc"/> + <project path="toolchain/android_rust" name="toolchain/android_rust"/> + <project path="toolchain/common" name="toolchain/common"/> + <project path="toolchain/cargo-deny" name="toolchain/cargo-deny"/> + <project path="toolchain/cargo-vet" name="toolchain/cargo-vet"/> + + <!-- Other Toolchains --> + <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1"/> + + <!-- libgcc for device --> + <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" clone-depth="1"/> + <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" clone-depth="1"/> + <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" clone-depth="1"/> + <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" clone-depth="1"/> + + <!-- Tool prebuilts --> + <project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1"/> + <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1"/> + <project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1"/> + <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1"/> + <project path="prebuilts/cmake/windows-x86" name="platform/prebuilts/cmake/windows-x86" clone-depth="1"/> + <project path="prebuilts/ninja/windows-x86" name="platform/prebuilts/ninja/windows-x86" clone-depth="1"/> + + <!-- 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" /> </manifest> |