AOSP-mirror: Rename to mirrors/AOSP

To release a Replicant 6 version, we need to tag all the
repositories.

For some time, the LineageOS mirrors have been moved in
mirrors/LineageOS. We have redirections in place to continue
being able to fetch old revisions of Replicant.

We have HTTP and HTTPS redirection (it's done with Apache),
but no redirection for git:// or ssh.

Because of that, when we removed the symlinks to make the
setup more robust, git:// or ssh weren't redirected anymore.

This removal doesn't affect the ability to fetch old revisions
as people are expected to use HTTP or HTTPS to fetch the full
Replicant source code.

However it broke the release process: The releasetag.sh script
(which is in the vendor_replicant-release-scripts repository)
was using the git remote URL to reconstruct the URI to which to
push the tag to.

To fix that the best way is update the manifest to make sure
that the address to which to push correspond to the one that
is used to download the repositories.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 192 insertions, 192 deletions

diff --git a/default.xml b/default.xml
index 23389cc..917bb40 100644
--- a/default.xml
+++ b/default.xml
@@ -33,7 +33,7 @@
   <project path="art" name="mirrors/LineageOS/android_art.git" groups="pdk" />
   <project path="bionic" name="mirrors/LineageOS/android_bionic.git" groups="pdk" />
   <project path="bootable/recovery" name="replicant/bootable_recovery.git" remote="replicant" groups="pdk" />
-  <project path="cts" name="AOSP-mirror/platform_cts" groups="cts,pdk-cw-fs,pdk-fs" revision="marshmallow-cts-release" remote="aosp" />
+  <project path="cts" name="mirrors/AOSP/platform_cts" groups="cts,pdk-cw-fs,pdk-fs" revision="marshmallow-cts-release" remote="aosp" />
   <project path="dalvik" name="mirrors/LineageOS/android_dalvik.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="development" name="mirrors/LineageOS/android_development.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="device/common" name="mirrors/LineageOS/android_device_common.git" groups="pdk-cw-fs,pdk-fs" />
@@ -221,7 +221,7 @@
   <project path="packages/apps/Exchange" name="mirrors/LineageOS/android_packages_apps_Exchange.git" groups="pdk-fs" />
   <project path="packages/apps/FDroidPrivilegedExtension" name="F-Droid-mirror/privileged-extension.git" remote="fdroid" />
   <project path="packages/apps/FMRadio" name="mirrors/LineageOS/android_packages_apps_FMRadio.git" groups="pdk-fs" />
-  <project path="packages/apps/Gallery" name="AOSP-mirror/platform_packages_apps_Gallery.git" groups="pdk-fs" remote="aosp" />
+  <project path="packages/apps/Gallery" name="mirrors/AOSP/platform_packages_apps_Gallery.git" groups="pdk-fs" remote="aosp" />
   <project path="packages/apps/Gallery2" name="mirrors/LineageOS/android_packages_apps_Gallery2.git" groups="pdk-fs" />
   <project path="packages/apps/Gello" name="mirrors/LineageOS/android_packages_apps_Gello.git" />
   <project path="packages/apps/HTMLViewer" name="mirrors/LineageOS/android_packages_apps_HTMLViewer.git" groups="pdk-fs" />
@@ -308,207 +308,207 @@
 <!-- END LINEAGEOS -->
 
 <!-- BEGIN AOSP -->
-  <project path="developers/build" name="AOSP-mirror/platform_developers_build" remote="aosp" />
-  <project path="developers/samples/android" name="AOSP-mirror/platform_developers_samples_android" remote="aosp" />
-  <project path="device/generic/mini-emulator-arm64" name="AOSP-mirror/device_generic_mini-emulator-arm64" groups="pdk" remote="aosp" />
-  <project path="device/generic/mini-emulator-armv7-a-neon" name="AOSP-mirror/device_generic_mini-emulator-armv7-a-neon" groups="pdk" remote="aosp" />
-  <project path="device/generic/mini-emulator-mips" name="AOSP-mirror/device_generic_mini-emulator-mips" groups="pdk" remote="aosp" />
-  <project path="device/generic/mini-emulator-x86" name="AOSP-mirror/device_generic_mini-emulator-x86" groups="pdk" remote="aosp" />
-  <project path="device/generic/mini-emulator-x86_64" name="AOSP-mirror/device_generic_mini-emulator-x86_64" groups="pdk" remote="aosp" />
-  <project path="device/generic/qemu" name="AOSP-mirror/device_generic_qemu" remote="aosp" />
-  <project path="device/generic/x86" name="AOSP-mirror/device_generic_x86" groups="pdk" remote="aosp" />
-  <project path="device/generic/x86_64" name="AOSP-mirror/device_generic_x86_64" groups="pdk" remote="aosp" />
-  <project path="device/google/accessory/arduino" name="AOSP-mirror/device_google_accessory_arduino" groups="device" remote="aosp" />
-  <project path="device/google/accessory/demokit" name="AOSP-mirror/device_google_accessory_demokit" groups="device" remote="aosp" />
-  <project path="device/sample" name="AOSP-mirror/device_sample" groups="pdk" remote="aosp" />
-  <project path="docs/source.android.com" name="AOSP-mirror/platform_docs_source.android.com" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="developers/build" name="mirrors/AOSP/platform_developers_build" remote="aosp" />
+  <project path="developers/samples/android" name="mirrors/AOSP/platform_developers_samples_android" remote="aosp" />
+  <project path="device/generic/mini-emulator-arm64" name="mirrors/AOSP/device_generic_mini-emulator-arm64" groups="pdk" remote="aosp" />
+  <project path="device/generic/mini-emulator-armv7-a-neon" name="mirrors/AOSP/device_generic_mini-emulator-armv7-a-neon" groups="pdk" remote="aosp" />
+  <project path="device/generic/mini-emulator-mips" name="mirrors/AOSP/device_generic_mini-emulator-mips" groups="pdk" remote="aosp" />
+  <project path="device/generic/mini-emulator-x86" name="mirrors/AOSP/device_generic_mini-emulator-x86" groups="pdk" remote="aosp" />
+  <project path="device/generic/mini-emulator-x86_64" name="mirrors/AOSP/device_generic_mini-emulator-x86_64" groups="pdk" remote="aosp" />
+  <project path="device/generic/qemu" name="mirrors/AOSP/device_generic_qemu" remote="aosp" />
+  <project path="device/generic/x86" name="mirrors/AOSP/device_generic_x86" groups="pdk" remote="aosp" />
+  <project path="device/generic/x86_64" name="mirrors/AOSP/device_generic_x86_64" groups="pdk" remote="aosp" />
+  <project path="device/google/accessory/arduino" name="mirrors/AOSP/device_google_accessory_arduino" groups="device" remote="aosp" />
+  <project path="device/google/accessory/demokit" name="mirrors/AOSP/device_google_accessory_demokit" groups="device" remote="aosp" />
+  <project path="device/sample" name="mirrors/AOSP/device_sample" groups="pdk" remote="aosp" />
+  <project path="docs/source.android.com" name="mirrors/AOSP/platform_docs_source.android.com" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/aac" name="mirrors/LineageOS/android_external_aac.git" groups="pdk" remote="lineage-mirror" />
-  <project path="external/androidplot" name="AOSP-mirror/platform_external_androidplot" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/antlr" name="AOSP-mirror/platform_external_antlr" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/apache-commons-math" name="AOSP-mirror/platform_external_apache-commons-math" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/apache-harmony" name="AOSP-mirror/platform_external_apache-harmony" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/apache-xml" name="AOSP-mirror/platform_external_apache-xml" groups="pdk" remote="aosp" />
-  <project path="external/bison" name="AOSP-mirror/platform_external_bison" groups="pdk" remote="aosp" />
-  <project path="external/blktrace" name="AOSP-mirror/platform_external_blktrace" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/bsdiff" name="AOSP-mirror/platform_external_bsdiff" groups="pdk" remote="aosp" />
-  <project path="external/cblas" name="AOSP-mirror/platform_external_cblas" groups="pdk" remote="aosp" />
-  <project path="external/ceres-solver" name="AOSP-mirror/platform_external_ceres-solver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/chromium-libpac" name="AOSP-mirror/platform_external_chromium-libpac" groups="pdk-fs" remote="aosp" />
-  <project path="external/chromium-trace" name="AOSP-mirror/platform_external_chromium-trace" groups="pdk" remote="aosp" />
+  <project path="external/androidplot" name="mirrors/AOSP/platform_external_androidplot" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/antlr" name="mirrors/AOSP/platform_external_antlr" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/apache-commons-math" name="mirrors/AOSP/platform_external_apache-commons-math" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/apache-harmony" name="mirrors/AOSP/platform_external_apache-harmony" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/apache-xml" name="mirrors/AOSP/platform_external_apache-xml" groups="pdk" remote="aosp" />
+  <project path="external/bison" name="mirrors/AOSP/platform_external_bison" groups="pdk" remote="aosp" />
+  <project path="external/blktrace" name="mirrors/AOSP/platform_external_blktrace" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/bsdiff" name="mirrors/AOSP/platform_external_bsdiff" groups="pdk" remote="aosp" />
+  <project path="external/cblas" name="mirrors/AOSP/platform_external_cblas" groups="pdk" remote="aosp" />
+  <project path="external/ceres-solver" name="mirrors/AOSP/platform_external_ceres-solver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/chromium-libpac" name="mirrors/AOSP/platform_external_chromium-libpac" groups="pdk-fs" remote="aosp" />
+  <project path="external/chromium-trace" name="mirrors/AOSP/platform_external_chromium-trace" groups="pdk" remote="aosp" />
   <project path="external/chromium-webview" name="replicant/external_chromium-webview.git" groups="pdk" clone-depth="1" remote="replicant" />
-  <project path="external/clang" name="AOSP-mirror/platform_external_clang" groups="pdk" remote="aosp" />
-  <project path="external/cmockery" name="AOSP-mirror/platform_external_cmockery" groups="pdk-fs" remote="aosp" />
-  <project path="external/compiler-rt" name="AOSP-mirror/platform_external_compiler-rt" groups="pdk" remote="aosp" />
-  <project path="external/conscrypt" name="AOSP-mirror/platform_external_conscrypt" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/crcalc" name="AOSP-mirror/platform_external_crcalc" groups="pdk-fs" remote="aosp" />
-  <project path="external/deqp" name="AOSP-mirror/platform_external_deqp" groups="pdk-fs" remote="aosp" />
-  <project path="external/dexmaker" name="AOSP-mirror/platform_external_dexmaker" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/donuts" name="AOSP-mirror/platform_external_donuts" groups="pdk-fs" remote="aosp" />
+  <project path="external/clang" name="mirrors/AOSP/platform_external_clang" groups="pdk" remote="aosp" />
+  <project path="external/cmockery" name="mirrors/AOSP/platform_external_cmockery" groups="pdk-fs" remote="aosp" />
+  <project path="external/compiler-rt" name="mirrors/AOSP/platform_external_compiler-rt" groups="pdk" remote="aosp" />
+  <project path="external/conscrypt" name="mirrors/AOSP/platform_external_conscrypt" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/crcalc" name="mirrors/AOSP/platform_external_crcalc" groups="pdk-fs" remote="aosp" />
+  <project path="external/deqp" name="mirrors/AOSP/platform_external_deqp" groups="pdk-fs" remote="aosp" />
+  <project path="external/dexmaker" name="mirrors/AOSP/platform_external_dexmaker" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/donuts" name="mirrors/AOSP/platform_external_donuts" groups="pdk-fs" remote="aosp" />
   <project path="external/drm_gralloc" name="replicant/external_drm_gralloc.git" groups="drm_gralloc" remote="replicant" />
-  <project path="external/drm_hwcomposer" name="AOSP-mirror/platform_external_drm_hwcomposer" groups="drm_hwcomposer" remote="aosp" />
-  <project path="external/droiddriver" name="AOSP-mirror/platform_external_droiddriver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/easymock" name="AOSP-mirror/platform_external_easymock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/eclipse-windowbuilder" name="AOSP-mirror/platform_external_eclipse-windowbuilder" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/eigen" name="AOSP-mirror/platform_external_eigen" groups="pdk" remote="aosp" />
-  <project path="external/embunit" name="AOSP-mirror/platform_external_embunit" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/emma" name="AOSP-mirror/platform_external_emma" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/esd" name="AOSP-mirror/platform_external_esd" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/expat" name="AOSP-mirror/platform_external_expat" groups="pdk" remote="aosp" />
-  <project path="external/eyes-free" name="AOSP-mirror/platform_external_eyes-free" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/fdlibm" name="AOSP-mirror/platform_external_fdlibm" groups="pdk" remote="aosp" />
-  <project path="external/fio" name="AOSP-mirror/platform_external_fio" groups="pdk-fs" remote="aosp" />
-  <project path="external/fonttools" name="AOSP-mirror/platform_external_fonttools" groups="pdk-fs" remote="aosp" />
-  <project path="external/freetype" name="AOSP-mirror/platform_external_freetype" groups="pdk" remote="aosp" />
-  <project path="external/giflib" name="AOSP-mirror/platform_external_giflib" groups="pdk,qcom_msm8x26" remote="aosp" />
-  <project path="external/glide" name="AOSP-mirror/platform_external_glide" groups="pdk-fs" remote="aosp" />
-  <project path="external/google-breakpad" name="AOSP-mirror/platform_external_google-breakpad" groups="dragon" remote="aosp" />
-  <project path="external/google-fonts/carrois-gothic-sc" name="AOSP-mirror/platform_external_google-fonts_carrois-gothic-sc" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/google-fonts/coming-soon" name="AOSP-mirror/platform_external_google-fonts_coming-soon" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/google-fonts/cutive-mono" name="AOSP-mirror/platform_external_google-fonts_cutive-mono" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/google-fonts/dancing-script" name="AOSP-mirror/platform_external_google-fonts_dancing-script" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/google-tv-pairing-protocol" name="AOSP-mirror/platform_external_google-tv-pairing-protocol" groups="pdk-fs" remote="aosp" />
-  <project path="external/gtest" name="AOSP-mirror/platform_external_gtest" groups="pdk" remote="aosp" />
-  <project path="external/hamcrest" name="AOSP-mirror/platform_external_hamcrest" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/harfbuzz_ng" name="AOSP-mirror/platform_external_harfbuzz_ng" groups="pdk,qcom_msm8x26" remote="aosp" />
-  <project path="external/hyphenation-patterns" name="AOSP-mirror/platform_external_hyphenation-patterns" groups="pdk-fs" remote="aosp" />
-  <project path="external/ipsec-tools" name="AOSP-mirror/platform_external_ipsec-tools" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/iputils" name="AOSP-mirror/platform_external_iputils" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/javasqlite" name="AOSP-mirror/platform_external_javasqlite" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/javassist" name="AOSP-mirror/platform_external_javassist" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/jdiff" name="AOSP-mirror/platform_external_jdiff" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/jemalloc" name="AOSP-mirror/platform_external_jemalloc" groups="pdk" remote="aosp" />
-  <project path="external/jetty" name="AOSP-mirror/platform_external_jetty" groups="pdk-fs" remote="aosp" />
-  <project path="external/jhead" name="AOSP-mirror/platform_external_jhead" groups="pdk" remote="aosp" />
-  <project path="external/jline" name="AOSP-mirror/platform_external_jline" groups="notdefault,tradefed" remote="aosp" />
-  <project path="external/jmdns" name="AOSP-mirror/platform_external_jmdns" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/jmonkeyengine" name="AOSP-mirror/platform_external_jmonkeyengine" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/jsilver" name="AOSP-mirror/platform_external_jsilver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/jsmn" name="AOSP-mirror/platform_external_jsmn" groups="pdk" remote="aosp" />
-  <project path="external/jsoncpp" name="AOSP-mirror/platform_external_jsoncpp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/junit" name="AOSP-mirror/platform_external_junit" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/kernel-headers" name="AOSP-mirror/platform_external_kernel-headers" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/ksoap2" name="AOSP-mirror/platform_external_ksoap2" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libcap-ng" name="AOSP-mirror/platform_external_libcap-ng" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libcxx" name="AOSP-mirror/platform_external_libcxx" groups="pdk" remote="aosp" />
-  <project path="external/libcxxabi" name="AOSP-mirror/platform_external_libcxxabi" groups="pdk" remote="aosp" />
-  <project path="external/libdrm" name="AOSP-mirror/platform_external_libdrm" groups="pdk" remote="aosp" />
-  <project path="external/libedit" name="AOSP-mirror/platform_external_libedit" groups="pdk-fs" remote="aosp" />
-  <project path="external/libexif" name="AOSP-mirror/platform_external_libexif" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libgsm" name="AOSP-mirror/platform_external_libgsm" groups="pdk" remote="aosp" />
-  <project path="external/liblzf" name="AOSP-mirror/platform_external_liblzf" groups="pdk" remote="aosp" />
-  <project path="external/libmtp" name="AOSP-mirror/platform_external_libmtp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libogg" name="AOSP-mirror/platform_external_libogg" groups="pdk" remote="aosp" />
-  <project path="external/libopus" name="AOSP-mirror/platform_external_libopus" groups="pdk" remote="aosp" />
-  <project path="external/libpcap" name="AOSP-mirror/platform_external_libpcap" groups="pdk,pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libpng" name="AOSP-mirror/platform_external_libpng" groups="pdk" remote="aosp" />
-  <project path="external/libphonenumber" name="AOSP-mirror/platform_external_libphonenumber" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libunwind" name="AOSP-mirror/platform_external_libunwind" groups="pdk" remote="aosp" />
-  <project path="external/libusb-compat" name="AOSP-mirror/platform_external_libusb-compat" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libutf" name="AOSP-mirror/platform_external_libutf" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/libvncserver" name="AOSP-mirror/platform_external_libvncserver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/drm_hwcomposer" name="mirrors/AOSP/platform_external_drm_hwcomposer" groups="drm_hwcomposer" remote="aosp" />
+  <project path="external/droiddriver" name="mirrors/AOSP/platform_external_droiddriver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/easymock" name="mirrors/AOSP/platform_external_easymock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/eclipse-windowbuilder" name="mirrors/AOSP/platform_external_eclipse-windowbuilder" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/eigen" name="mirrors/AOSP/platform_external_eigen" groups="pdk" remote="aosp" />
+  <project path="external/embunit" name="mirrors/AOSP/platform_external_embunit" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/emma" name="mirrors/AOSP/platform_external_emma" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/esd" name="mirrors/AOSP/platform_external_esd" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/expat" name="mirrors/AOSP/platform_external_expat" groups="pdk" remote="aosp" />
+  <project path="external/eyes-free" name="mirrors/AOSP/platform_external_eyes-free" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/fdlibm" name="mirrors/AOSP/platform_external_fdlibm" groups="pdk" remote="aosp" />
+  <project path="external/fio" name="mirrors/AOSP/platform_external_fio" groups="pdk-fs" remote="aosp" />
+  <project path="external/fonttools" name="mirrors/AOSP/platform_external_fonttools" groups="pdk-fs" remote="aosp" />
+  <project path="external/freetype" name="mirrors/AOSP/platform_external_freetype" groups="pdk" remote="aosp" />
+  <project path="external/giflib" name="mirrors/AOSP/platform_external_giflib" groups="pdk,qcom_msm8x26" remote="aosp" />
+  <project path="external/glide" name="mirrors/AOSP/platform_external_glide" groups="pdk-fs" remote="aosp" />
+  <project path="external/google-breakpad" name="mirrors/AOSP/platform_external_google-breakpad" groups="dragon" remote="aosp" />
+  <project path="external/google-fonts/carrois-gothic-sc" name="mirrors/AOSP/platform_external_google-fonts_carrois-gothic-sc" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/google-fonts/coming-soon" name="mirrors/AOSP/platform_external_google-fonts_coming-soon" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/google-fonts/cutive-mono" name="mirrors/AOSP/platform_external_google-fonts_cutive-mono" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/google-fonts/dancing-script" name="mirrors/AOSP/platform_external_google-fonts_dancing-script" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/google-tv-pairing-protocol" name="mirrors/AOSP/platform_external_google-tv-pairing-protocol" groups="pdk-fs" remote="aosp" />
+  <project path="external/gtest" name="mirrors/AOSP/platform_external_gtest" groups="pdk" remote="aosp" />
+  <project path="external/hamcrest" name="mirrors/AOSP/platform_external_hamcrest" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/harfbuzz_ng" name="mirrors/AOSP/platform_external_harfbuzz_ng" groups="pdk,qcom_msm8x26" remote="aosp" />
+  <project path="external/hyphenation-patterns" name="mirrors/AOSP/platform_external_hyphenation-patterns" groups="pdk-fs" remote="aosp" />
+  <project path="external/ipsec-tools" name="mirrors/AOSP/platform_external_ipsec-tools" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/iputils" name="mirrors/AOSP/platform_external_iputils" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/javasqlite" name="mirrors/AOSP/platform_external_javasqlite" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/javassist" name="mirrors/AOSP/platform_external_javassist" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/jdiff" name="mirrors/AOSP/platform_external_jdiff" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/jemalloc" name="mirrors/AOSP/platform_external_jemalloc" groups="pdk" remote="aosp" />
+  <project path="external/jetty" name="mirrors/AOSP/platform_external_jetty" groups="pdk-fs" remote="aosp" />
+  <project path="external/jhead" name="mirrors/AOSP/platform_external_jhead" groups="pdk" remote="aosp" />
+  <project path="external/jline" name="mirrors/AOSP/platform_external_jline" groups="notdefault,tradefed" remote="aosp" />
+  <project path="external/jmdns" name="mirrors/AOSP/platform_external_jmdns" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/jmonkeyengine" name="mirrors/AOSP/platform_external_jmonkeyengine" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/jsilver" name="mirrors/AOSP/platform_external_jsilver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/jsmn" name="mirrors/AOSP/platform_external_jsmn" groups="pdk" remote="aosp" />
+  <project path="external/jsoncpp" name="mirrors/AOSP/platform_external_jsoncpp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/junit" name="mirrors/AOSP/platform_external_junit" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/kernel-headers" name="mirrors/AOSP/platform_external_kernel-headers" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/ksoap2" name="mirrors/AOSP/platform_external_ksoap2" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libcap-ng" name="mirrors/AOSP/platform_external_libcap-ng" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libcxx" name="mirrors/AOSP/platform_external_libcxx" groups="pdk" remote="aosp" />
+  <project path="external/libcxxabi" name="mirrors/AOSP/platform_external_libcxxabi" groups="pdk" remote="aosp" />
+  <project path="external/libdrm" name="mirrors/AOSP/platform_external_libdrm" groups="pdk" remote="aosp" />
+  <project path="external/libedit" name="mirrors/AOSP/platform_external_libedit" groups="pdk-fs" remote="aosp" />
+  <project path="external/libexif" name="mirrors/AOSP/platform_external_libexif" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libgsm" name="mirrors/AOSP/platform_external_libgsm" groups="pdk" remote="aosp" />
+  <project path="external/liblzf" name="mirrors/AOSP/platform_external_liblzf" groups="pdk" remote="aosp" />
+  <project path="external/libmtp" name="mirrors/AOSP/platform_external_libmtp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libogg" name="mirrors/AOSP/platform_external_libogg" groups="pdk" remote="aosp" />
+  <project path="external/libopus" name="mirrors/AOSP/platform_external_libopus" groups="pdk" remote="aosp" />
+  <project path="external/libpcap" name="mirrors/AOSP/platform_external_libpcap" groups="pdk,pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libpng" name="mirrors/AOSP/platform_external_libpng" groups="pdk" remote="aosp" />
+  <project path="external/libphonenumber" name="mirrors/AOSP/platform_external_libphonenumber" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libunwind" name="mirrors/AOSP/platform_external_libunwind" groups="pdk" remote="aosp" />
+  <project path="external/libusb-compat" name="mirrors/AOSP/platform_external_libusb-compat" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libutf" name="mirrors/AOSP/platform_external_libutf" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libvncserver" name="mirrors/AOSP/platform_external_libvncserver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/libvorbis" name="mirrors/LineageOS/android_external_libvorbis.git" groups="pdk-cw-fs,pdk-fs" remote="lineage-mirror" />
-  <project path="external/libyuv" name="AOSP-mirror/platform_external_libyuv" groups="libyuv,pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/littlemock" name="AOSP-mirror/platform_external_littlemock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/lld" name="AOSP-mirror/platform_external_lld" groups="pdk-fs" remote="aosp" />
-  <project path="external/lldb" name="AOSP-mirror/platform_external_lldb" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/libyuv" name="mirrors/AOSP/platform_external_libyuv" groups="libyuv,pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/littlemock" name="mirrors/AOSP/platform_external_littlemock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/lld" name="mirrors/AOSP/platform_external_lld" groups="pdk-fs" remote="aosp" />
+  <project path="external/lldb" name="mirrors/AOSP/platform_external_lldb" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/llvm" name="replicant/external_llvm.git" groups="pdk" remote="replicant" />
-  <project path="external/ltrace" name="AOSP-mirror/platform_external_ltrace" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/marisa-trie" name="AOSP-mirror/platform_external_marisa-trie" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/markdown" name="AOSP-mirror/platform_external_markdown" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/mdnsresponder" name="AOSP-mirror/platform_external_mdnsresponder" groups="pdk" remote="aosp" />
+  <project path="external/ltrace" name="mirrors/AOSP/platform_external_ltrace" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/marisa-trie" name="mirrors/AOSP/platform_external_marisa-trie" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/markdown" name="mirrors/AOSP/platform_external_markdown" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/mdnsresponder" name="mirrors/AOSP/platform_external_mdnsresponder" groups="pdk" remote="aosp" />
   <project path="external/mesa3d" name="replicant/external_mesa3d.git" groups="pdk-cw-fs,pdk-fs" remote="replicant" />
-  <project path="external/messageformat" name="AOSP-mirror/platform_external_messageformat" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/mockftpserver" name="AOSP-mirror/platform_external_mockftpserver" groups="pdk-fs" remote="aosp" />
-  <project path="external/mockito" name="AOSP-mirror/platform_external_mockito" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/mockwebserver" name="AOSP-mirror/platform_external_mockwebserver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/mp4parser" name="AOSP-mirror/platform_external_mp4parser" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/mtpd" name="AOSP-mirror/platform_external_mtpd" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/nanohttpd" name="AOSP-mirror/platform_external_nanohttpd" groups="pdk-fs" remote="aosp" />
-  <project path="external/nanopb-c" name="AOSP-mirror/platform_external_nanopb-c" groups="pdk" remote="aosp" />
-  <project path="external/naver-fonts" name="AOSP-mirror/platform_external_naver-fonts" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/netcat" name="AOSP-mirror/platform_external_netcat" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/netperf" name="AOSP-mirror/platform_external_netperf" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/neven" name="AOSP-mirror/platform_external_neven" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/nfacct" name="AOSP-mirror/platform_external_nfacct" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/nist-pkits" name="AOSP-mirror/platform_external_nist-pkits" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/noto-fonts" name="AOSP-mirror/platform_external_noto-fonts" groups="pdk" remote="aosp" />
-  <project path="external/oauth" name="AOSP-mirror/platform_external_oauth" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/objenesis" name="AOSP-mirror/platform_external_objenesis" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/opencv" name="AOSP-mirror/platform_external_opencv" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/openfst" name="AOSP-mirror/platform_external_openfst" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/owasp/sanitizer" name="AOSP-mirror/platform_external_owasp_sanitizer" groups="pdk-fs" remote="aosp" />
+  <project path="external/messageformat" name="mirrors/AOSP/platform_external_messageformat" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/mockftpserver" name="mirrors/AOSP/platform_external_mockftpserver" groups="pdk-fs" remote="aosp" />
+  <project path="external/mockito" name="mirrors/AOSP/platform_external_mockito" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/mockwebserver" name="mirrors/AOSP/platform_external_mockwebserver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/mp4parser" name="mirrors/AOSP/platform_external_mp4parser" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/mtpd" name="mirrors/AOSP/platform_external_mtpd" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/nanohttpd" name="mirrors/AOSP/platform_external_nanohttpd" groups="pdk-fs" remote="aosp" />
+  <project path="external/nanopb-c" name="mirrors/AOSP/platform_external_nanopb-c" groups="pdk" remote="aosp" />
+  <project path="external/naver-fonts" name="mirrors/AOSP/platform_external_naver-fonts" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/netcat" name="mirrors/AOSP/platform_external_netcat" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/netperf" name="mirrors/AOSP/platform_external_netperf" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/neven" name="mirrors/AOSP/platform_external_neven" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/nfacct" name="mirrors/AOSP/platform_external_nfacct" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/nist-pkits" name="mirrors/AOSP/platform_external_nist-pkits" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/noto-fonts" name="mirrors/AOSP/platform_external_noto-fonts" groups="pdk" remote="aosp" />
+  <project path="external/oauth" name="mirrors/AOSP/platform_external_oauth" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/objenesis" name="mirrors/AOSP/platform_external_objenesis" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/opencv" name="mirrors/AOSP/platform_external_opencv" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/openfst" name="mirrors/AOSP/platform_external_openfst" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/owasp/sanitizer" name="mirrors/AOSP/platform_external_owasp_sanitizer" groups="pdk-fs" remote="aosp" />
   <project path="external/parameter-framework" name="replicant/external_parameter-framework.git" groups="pdk-fs" remote="replicant" />
-  <project path="external/ppp" name="AOSP-mirror/platform_external_ppp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/proguard" name="AOSP-mirror/platform_external_proguard" groups="pdk" remote="aosp" />
+  <project path="external/ppp" name="mirrors/AOSP/platform_external_ppp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/proguard" name="mirrors/AOSP/platform_external_proguard" groups="pdk" remote="aosp" />
   <project path="external/protobuf" name="replicant/external_protobuf.git" groups="pdk" remote="replicant" />
-  <project path="external/regex-re2" name="AOSP-mirror/platform_external_regex-re2" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/replicaisland" name="AOSP-mirror/platform_external_replicaisland" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/robolectric" name="AOSP-mirror/platform_external_robolectric" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/roboto-fonts" name="AOSP-mirror/platform_external_roboto-fonts" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/safe-iop" name="AOSP-mirror/platform_external_safe-iop" groups="pdk" remote="aosp" />
-  <project path="external/scrypt" name="AOSP-mirror/platform_external_scrypt" groups="pdk" remote="aosp" />
-  <project path="external/selinux" name="AOSP-mirror/platform_external_selinux" groups="pdk" remote="aosp" />
-  <project path="external/sfntly" name="AOSP-mirror/platform_external_sfntly" groups="pdk,qcom_msm8x26" remote="aosp" />
-  <project path="external/slf4j" name="AOSP-mirror/platform_external_slf4j" groups="pdk-fs" remote="aosp" />
-  <project path="external/smali" name="AOSP-mirror/platform_external_smali" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/sonic" name="AOSP-mirror/platform_external_sonic" groups="pdk" remote="aosp" />
-  <project path="external/sqlite" name="AOSP-mirror/platform_external_sqlite" groups="pdk" remote="aosp" />
-  <project path="external/squashfs-tools" name="AOSP-mirror/platform_external_squashfs-tools" groups="pdk" remote="aosp" />
-  <project path="external/srtp" name="AOSP-mirror/platform_external_srtp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/svox" name="AOSP-mirror/platform_external_svox" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/tagsoup" name="AOSP-mirror/platform_external_tagsoup" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/timezonepicker-support" name="AOSP-mirror/platform_external_timezonepicker-support" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/tinyxml" name="AOSP-mirror/platform_external_tinyxml" groups="pdk" remote="aosp" />
-  <project path="external/tremolo" name="AOSP-mirror/platform_external_tremolo" groups="pdk" remote="aosp" />
-  <project path="external/v8" name="AOSP-mirror/platform_external_v8" groups="pdk" remote="aosp" />
-  <project path="external/valgrind" name="AOSP-mirror/platform_external_valgrind" groups="pdk" remote="aosp" />
-  <project path="external/vboot_reference" name="AOSP-mirror/platform_external_vboot_reference" groups="vboot" remote="aosp" />
-  <project path="external/vixl" name="AOSP-mirror/platform_external_vixl" groups="pdk" remote="aosp" />
-  <project path="external/webp" name="AOSP-mirror/platform_external_webp" groups="pdk,qcom_msm8x26" remote="aosp" />
-  <project path="external/webrtc" name="AOSP-mirror/platform_external_webrtc" groups="pdk" remote="aosp" />
-  <project path="external/xmlwriter" name="AOSP-mirror/platform_external_xmlwriter" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/xmp_toolkit" name="AOSP-mirror/platform_external_xmp_toolkit" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/zopfli" name="AOSP-mirror/platform_external_zopfli" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/zxing" name="AOSP-mirror/platform_external_zxing" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="frameworks/opt/inputconnectioncommon" name="AOSP-mirror/platform_frameworks_opt_inputconnectioncommon" groups="pdk-fs" remote="aosp" />
-  <project path="frameworks/data-binding" name="AOSP-mirror/platform_frameworks_data-binding" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="hardware/intel/audio_media" name="AOSP-mirror/platform_hardware_intel_audio_media" groups="intel" remote="aosp" />
-  <project path="hardware/intel/bootstub" name="AOSP-mirror/platform_hardware_intel_bootstub" groups="intel" remote="aosp" />
-  <project path="hardware/intel/common/bd_prov" name="AOSP-mirror/platform_hardware_intel_common_bd_prov" groups="intel" remote="aosp" />
-  <project path="hardware/intel/common/libstagefrighthw" name="AOSP-mirror/platform_hardware_intel_common_libstagefrighthw" groups="intel" remote="aosp"/>
-  <project path="hardware/intel/common/utils" name="AOSP-mirror/platform_hardware_intel_common_utils" groups="intel" remote="aosp" />
-  <project path="hardware/intel/common/wrs_omxil_core" name="AOSP-mirror/platform_hardware_intel_common_wrs_omxil_core" groups="intel" remote="aosp" />
-  <project path="hardware/intel/sensors" name="AOSP-mirror/platform_hardware_intel_sensors" groups="intel_sensors" remote="aosp" />
-  <project path="hardware/marvell/bt" name="AOSP-mirror/platform_hardware_marvell_bt" groups="marvell_bt" remote="aosp" />
-  <project path="hardware/qcom/msm8960" name="AOSP-mirror/platform_hardware_qcom_msm8960" groups="qcom_msm8960" remote="aosp" />
-  <project path="hardware/qcom/msm8994" name="AOSP-mirror/platform_hardware_qcom_msm8994" groups="qcom_msm8994" remote="aosp" />
-  <project path="hardware/qcom/msm8x26" name="AOSP-mirror/platform_hardware_qcom_msm8x26" groups="qcom_msm8x26" remote="aosp" />
-  <project path="hardware/qcom/msm8x27" name="AOSP-mirror/platform_hardware_qcom_msm8x27" groups="qcom_msm8x27" remote="aosp" />
-  <project path="hardware/qcom/msm8x74" name="AOSP-mirror/platform_hardware_qcom_msm8x74" groups="pdk,qcom_msm8x74" remote="aosp" />
-  <project path="hardware/qcom/msm8x84" name="AOSP-mirror/platform_hardware_qcom_msm8x84" groups="qcom_msm8x84" remote="aosp" />
-  <project path="hardware/ti/omap3" name="AOSP-mirror/platform_hardware_ti_omap3" groups="omap3" remote="aosp" />
-  <project path="hardware/ti/omap4-aah" name="AOSP-mirror/platform_hardware_ti_omap4-aah" groups="omap4-aah" remote="aosp" />
-  <project path="ndk" name="AOSP-mirror/platform_ndk" groups="generic_fs" remote="aosp" />
-  <project path="packages/apps/OneTimeInitializer" name="AOSP-mirror/platform_packages_apps_OneTimeInitializer" remote="aosp" />
-  <project path="pdk" name="AOSP-mirror/platform_pdk" groups="pdk" remote="aosp" />
-  <project path="platform_testing" name="AOSP-mirror/platform_platform_testing" remote="aosp" />
-  <project path="prebuilts/android-emulator" name="AOSP-mirror/platform_prebuilts_android-emulator" groups="notdefault,pdk-fs" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/devtools" name="AOSP-mirror/platform_prebuilts_devtools" groups="notdefault,pdk-fs" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/eclipse" name="AOSP-mirror/platform_prebuilts_eclipse" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/eclipse-build-deps" name="AOSP-mirror/platform_prebuilts_eclipse-build-deps" groups="notdefault,eclipse" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="AOSP-mirror/platform_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9" groups="notdefault,pdk,linux,arm" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="AOSP-mirror/platform_prebuilts_gcc_linux-x86_mips_mips64el-linux-android-4.9" groups="notdefault,pdk,linux,mips" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="AOSP-mirror/platform_prebuilts_gcc_linux-x86_x86_x86_64-linux-android-4.9" groups="notdefault,pdk,linux,x86" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/gradle-plugin" name="AOSP-mirror/platform_prebuilts_gradle-plugin" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/libs/libedit" name="AOSP-mirror/platform_prebuilts_libs_libedit" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/maven_repo/android" name="AOSP-mirror/platform_prebuilts_maven_repo_android" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/misc" name="AOSP-mirror/platform_prebuilts_misc" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
+  <project path="external/regex-re2" name="mirrors/AOSP/platform_external_regex-re2" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/replicaisland" name="mirrors/AOSP/platform_external_replicaisland" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/robolectric" name="mirrors/AOSP/platform_external_robolectric" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/roboto-fonts" name="mirrors/AOSP/platform_external_roboto-fonts" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/safe-iop" name="mirrors/AOSP/platform_external_safe-iop" groups="pdk" remote="aosp" />
+  <project path="external/scrypt" name="mirrors/AOSP/platform_external_scrypt" groups="pdk" remote="aosp" />
+  <project path="external/selinux" name="mirrors/AOSP/platform_external_selinux" groups="pdk" remote="aosp" />
+  <project path="external/sfntly" name="mirrors/AOSP/platform_external_sfntly" groups="pdk,qcom_msm8x26" remote="aosp" />
+  <project path="external/slf4j" name="mirrors/AOSP/platform_external_slf4j" groups="pdk-fs" remote="aosp" />
+  <project path="external/smali" name="mirrors/AOSP/platform_external_smali" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/sonic" name="mirrors/AOSP/platform_external_sonic" groups="pdk" remote="aosp" />
+  <project path="external/sqlite" name="mirrors/AOSP/platform_external_sqlite" groups="pdk" remote="aosp" />
+  <project path="external/squashfs-tools" name="mirrors/AOSP/platform_external_squashfs-tools" groups="pdk" remote="aosp" />
+  <project path="external/srtp" name="mirrors/AOSP/platform_external_srtp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/svox" name="mirrors/AOSP/platform_external_svox" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/tagsoup" name="mirrors/AOSP/platform_external_tagsoup" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/timezonepicker-support" name="mirrors/AOSP/platform_external_timezonepicker-support" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/tinyxml" name="mirrors/AOSP/platform_external_tinyxml" groups="pdk" remote="aosp" />
+  <project path="external/tremolo" name="mirrors/AOSP/platform_external_tremolo" groups="pdk" remote="aosp" />
+  <project path="external/v8" name="mirrors/AOSP/platform_external_v8" groups="pdk" remote="aosp" />
+  <project path="external/valgrind" name="mirrors/AOSP/platform_external_valgrind" groups="pdk" remote="aosp" />
+  <project path="external/vboot_reference" name="mirrors/AOSP/platform_external_vboot_reference" groups="vboot" remote="aosp" />
+  <project path="external/vixl" name="mirrors/AOSP/platform_external_vixl" groups="pdk" remote="aosp" />
+  <project path="external/webp" name="mirrors/AOSP/platform_external_webp" groups="pdk,qcom_msm8x26" remote="aosp" />
+  <project path="external/webrtc" name="mirrors/AOSP/platform_external_webrtc" groups="pdk" remote="aosp" />
+  <project path="external/xmlwriter" name="mirrors/AOSP/platform_external_xmlwriter" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/xmp_toolkit" name="mirrors/AOSP/platform_external_xmp_toolkit" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/zopfli" name="mirrors/AOSP/platform_external_zopfli" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="external/zxing" name="mirrors/AOSP/platform_external_zxing" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="frameworks/opt/inputconnectioncommon" name="mirrors/AOSP/platform_frameworks_opt_inputconnectioncommon" groups="pdk-fs" remote="aosp" />
+  <project path="frameworks/data-binding" name="mirrors/AOSP/platform_frameworks_data-binding" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="hardware/intel/audio_media" name="mirrors/AOSP/platform_hardware_intel_audio_media" groups="intel" remote="aosp" />
+  <project path="hardware/intel/bootstub" name="mirrors/AOSP/platform_hardware_intel_bootstub" groups="intel" remote="aosp" />
+  <project path="hardware/intel/common/bd_prov" name="mirrors/AOSP/platform_hardware_intel_common_bd_prov" groups="intel" remote="aosp" />
+  <project path="hardware/intel/common/libstagefrighthw" name="mirrors/AOSP/platform_hardware_intel_common_libstagefrighthw" groups="intel" remote="aosp"/>
+  <project path="hardware/intel/common/utils" name="mirrors/AOSP/platform_hardware_intel_common_utils" groups="intel" remote="aosp" />
+  <project path="hardware/intel/common/wrs_omxil_core" name="mirrors/AOSP/platform_hardware_intel_common_wrs_omxil_core" groups="intel" remote="aosp" />
+  <project path="hardware/intel/sensors" name="mirrors/AOSP/platform_hardware_intel_sensors" groups="intel_sensors" remote="aosp" />
+  <project path="hardware/marvell/bt" name="mirrors/AOSP/platform_hardware_marvell_bt" groups="marvell_bt" remote="aosp" />
+  <project path="hardware/qcom/msm8960" name="mirrors/AOSP/platform_hardware_qcom_msm8960" groups="qcom_msm8960" remote="aosp" />
+  <project path="hardware/qcom/msm8994" name="mirrors/AOSP/platform_hardware_qcom_msm8994" groups="qcom_msm8994" remote="aosp" />
+  <project path="hardware/qcom/msm8x26" name="mirrors/AOSP/platform_hardware_qcom_msm8x26" groups="qcom_msm8x26" remote="aosp" />
+  <project path="hardware/qcom/msm8x27" name="mirrors/AOSP/platform_hardware_qcom_msm8x27" groups="qcom_msm8x27" remote="aosp" />
+  <project path="hardware/qcom/msm8x74" name="mirrors/AOSP/platform_hardware_qcom_msm8x74" groups="pdk,qcom_msm8x74" remote="aosp" />
+  <project path="hardware/qcom/msm8x84" name="mirrors/AOSP/platform_hardware_qcom_msm8x84" groups="qcom_msm8x84" remote="aosp" />
+  <project path="hardware/ti/omap3" name="mirrors/AOSP/platform_hardware_ti_omap3" groups="omap3" remote="aosp" />
+  <project path="hardware/ti/omap4-aah" name="mirrors/AOSP/platform_hardware_ti_omap4-aah" groups="omap4-aah" remote="aosp" />
+  <project path="ndk" name="mirrors/AOSP/platform_ndk" groups="generic_fs" remote="aosp" />
+  <project path="packages/apps/OneTimeInitializer" name="mirrors/AOSP/platform_packages_apps_OneTimeInitializer" remote="aosp" />
+  <project path="pdk" name="mirrors/AOSP/platform_pdk" groups="pdk" remote="aosp" />
+  <project path="platform_testing" name="mirrors/AOSP/platform_platform_testing" remote="aosp" />
+  <project path="prebuilts/android-emulator" name="mirrors/AOSP/platform_prebuilts_android-emulator" groups="notdefault,pdk-fs" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/devtools" name="mirrors/AOSP/platform_prebuilts_devtools" groups="notdefault,pdk-fs" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/eclipse" name="mirrors/AOSP/platform_prebuilts_eclipse" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/eclipse-build-deps" name="mirrors/AOSP/platform_prebuilts_eclipse-build-deps" groups="notdefault,eclipse" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="mirrors/AOSP/platform_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9" groups="notdefault,pdk,linux,arm" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="mirrors/AOSP/platform_prebuilts_gcc_linux-x86_mips_mips64el-linux-android-4.9" groups="notdefault,pdk,linux,mips" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="mirrors/AOSP/platform_prebuilts_gcc_linux-x86_x86_x86_64-linux-android-4.9" groups="notdefault,pdk,linux,x86" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/gradle-plugin" name="mirrors/AOSP/platform_prebuilts_gradle-plugin" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/libs/libedit" name="mirrors/AOSP/platform_prebuilts_libs_libedit" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/maven_repo/android" name="mirrors/AOSP/platform_prebuilts_maven_repo_android" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/misc" name="mirrors/AOSP/platform_prebuilts_misc" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
   <project path="prebuilts/ndk" name="replicant/prebuilts_ndk.git" groups="pdk" clone-depth="1" remote="replicant" />
-  <project path="prebuilts/qemu-kernel" name="AOSP-mirror/platform_prebuilts_qemu-kernel" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/qemu-kernel" name="mirrors/AOSP/platform_prebuilts_qemu-kernel" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
   <project path="prebuilts/sdk" name="replicant/prebuilts_sdk.git" groups="pdk" clone-depth="1" remote="replicant" />
-  <project path="prebuilts/tools" name="AOSP-mirror/platform_prebuilts_tools" groups="notdefault,pdk,tools" clone-depth="1" remote="aosp" />
+  <project path="prebuilts/tools" name="mirrors/AOSP/platform_prebuilts_tools" groups="notdefault,pdk,tools" clone-depth="1" remote="aosp" />
   <project path="sdk" name="replicant/sdk.git" groups="pdk-cw-fs,pdk-fs" remote="replicant" />
-  <project path="system/gatekeeper" name="AOSP-mirror/platform_system_gatekeeper" groups="pdk" remote="aosp" />
+  <project path="system/gatekeeper" name="mirrors/AOSP/platform_system_gatekeeper" groups="pdk" remote="aosp" />
 <!-- END AOSP -->
 
 <!-- TOOLCHAIN -->