master-plus-rust - add superproject support.

There were duplicate entries for prebuilts/clang/host/linux-x86.
Commented out one of them to fix the following error:

fatal: manifest 'default.xml' not available
fatal: duplicate path prebuilts/clang/host/linux-x86 in /usr/local/google/home/rtenneti/work/drive2/android/master-plus-rust/.repo/manifests/default.xml

Bug: 179089288
Change-Id: Id4795c24bfa5497972dbd43b55d5f911b28ffbd8

GLOBAL-PREUPLOAD.cfg

@@ -10,12 +10,9 @@ commit_msg_test_field = true
 android_test_mapping_format = true
 
 [Tool Paths]
-bpfmt = ${REPO_ROOT}/prebuilts/build-tools/${BUILD_OS}/bin/bpfmt
 clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/clang-format
 git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/git-clang-format
 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
 cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py
-aidl-format = ${REPO_ROOT}/system/tools/aidl/aidl-format.sh

aosp-master-with-phones-gms.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-<!--
-    This branch is a master 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.
--->
-
-  <!-- pull in the standard AOSP-with-phones projects. -->
-  <include name="aosp-master-with-phones.xml" />
-
-  <project path="vendor/unbundled_google/packages/gms" name="platform/vendor/aosp/unbundled_google/packages/gms" groups="vendor" remote="goog" clone-depth="1" />
-
-</manifest>

aosp-master-with-phones.xml

@@ -8,35 +8,31 @@
 -->
 
   <remote  name="goog"
-           fetch="sso://googleplex-android.googlesource.com/"
-           review="sso://googleplex-android.googlesource.com/"
+           fetch="https://googleplex-android.googlesource.com/"
            revision="mirror-aosp-master-with-vendor" />
 
   <!-- pull in the standard AOSP projects. -->
   <include name="default.xml" />
 
-  <project path="vendor/google_devices/blueline" name="platform/vendor/aosp/google_devices/blueline" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/bonito" name="platform/vendor/aosp/google_devices/bonito" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/bramble" name="platform/vendor/aosp/google_devices/bramble" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/coral" name="platform/vendor/aosp/google_devices/coral" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/crosshatch" name="platform/vendor/aosp/google_devices/crosshatch" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/flame" name="platform/vendor/aosp/google_devices/flame" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/muskie" name="platform/vendor/aosp/google_devices/muskie" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/redfin" name="platform/vendor/aosp/google_devices/redfin" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/sargo" name="platform/vendor/aosp/google_devices/sargo" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/sunfish" name="platform/vendor/aosp/google_devices/sunfish" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google/misc/metrics_uploader_prebuilt" name="platform/vendor/google/misc/metrics_uploader_prebuilt" groups="vendor" remote="goog" clone-depth="1"/>
-  <project path="vendor/google/security" name="platform/vendor/google/security" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google/tools" name="platform/vendor/google/tools" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/linaro/hikey960" name="platform/vendor/aosp/linaro/hikey960" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/bonito" name="platform/vendor/aosp/qcom/bonito" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/bramble" name="platform/vendor/aosp/qcom/bramble" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/blueline" name="platform/vendor/aosp/qcom/blueline" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/coral" name="platform/vendor/aosp/qcom/coral" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/crosshatch" name="platform/vendor/aosp/qcom/crosshatch" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/flame" name="platform/vendor/aosp/qcom/flame" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/redfin" name="platform/vendor/aosp/qcom/redfin" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/sargo" name="platform/vendor/aosp/qcom/sargo" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/sunfish" name="platform/vendor/aosp/qcom/sunfish" groups="vendor" remote="goog" clone-depth="1" />
+  <project path="vendor/google_devices/blueline" name="platform/vendor/aosp/google_devices/blueline" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/bonito" name="platform/vendor/aosp/google_devices/bonito" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/crosshatch" name="platform/vendor/aosp/google_devices/crosshatch" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/marlin" name="platform/vendor/aosp/google_devices/marlin" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/muskie" name="platform/vendor/aosp/google_devices/muskie" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/sailfish" name="platform/vendor/aosp/google_devices/sailfish" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/sargo" name="platform/vendor/aosp/google_devices/sargo" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/taimen" name="platform/vendor/aosp/google_devices/taimen" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/walleye" name="platform/vendor/aosp/google_devices/walleye" groups="vendor" remote="goog" />
+  <project path="vendor/google/security" name="platform/vendor/google/security" groups="vendor" remote="goog" />
+  <project path="vendor/google/tools" name="platform/vendor/google/tools" groups="vendor" remote="goog" />
+  <project path="vendor/linaro/hikey960" name="platform/vendor/aosp/linaro/hikey960" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/bonito" name="platform/vendor/aosp/qcom/bonito" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/blueline" name="platform/vendor/aosp/qcom/blueline" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/crosshatch" name="platform/vendor/aosp/qcom/crosshatch" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/marlin" name="platform/vendor/aosp/qcom/marlin" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/sailfish" name="platform/vendor/aosp/qcom/sailfish" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/sargo" name="platform/vendor/aosp/qcom/sargo" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/taimen" name="platform/vendor/aosp/qcom/taimen" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/walleye" name="platform/vendor/aosp/qcom/walleye" groups="vendor" remote="goog" />
 
 </manifest>