DO NOT MERGE ANYWHERE Create manifest for aosp-emu-30-releaseaosp-emu-30-release

Change-Id: I86ce76ff9e7c5d55f12538d35c5b05e018baac9f
BUG: 160150983

1 files changed, 37 insertions, 45 deletions

diff --git a/default.xml b/default.xml
index ea9518ba9..1a0be1e2c 100644
--- a/default.xml
+++ b/default.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
   <remote  name="aosp"
            fetch=".."
            review="https://android-review.googlesource.com/" />
-  <default revision="emu-master-dev"
+  <default revision="aosp-emu-30-release"
            remote="aosp"
            sync-j="4" />
-
   <project path="build" name="platform/build" />
   <project path="tools/buildSrc" name="platform/tools/buildSrc">
     <copyfile src="base/build.gradle"      dest="tools/build.gradle" />
@@ -16,25 +14,24 @@
     <copyfile src="base/gradlew.bat"       dest="tools/gradlew.bat" />
     <copyfile src="base/gradle.properties" dest="tools/gradle.properties" />
   </project>
-
-  <project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" revision="master"/>
-  <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" revision="master"/>
+  <project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" />
+  <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" />
   <project path="external/angle" name="platform/external/angle" />
   <project path="external/adt-infra" name="platform/external/adt-infra" />
-  <project path="external/astc-codec" name="platform/external/astc-codec" revision="master" />
+  <project path="external/astc-codec" name="platform/external/astc-codec"  />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/boringssl" name="platform/external/boringssl" revision="master" clone-depth="1"/>
+  <project path="external/boringssl" name="platform/external/boringssl"  clone-depth="1"/>
   <project path="external/cares" name="platform/external/c-ares" />
   <project path="external/curl" name="platform/external/curl" />
-  <project path="external/deqp" name="platform/external/deqp" revision="master" />
+  <project path="external/deqp" name="platform/external/deqp"  />
   <project path="external/ffmpeg" name="platform/external/ffmpeg" />
-  <project path="external/googletest" name="platform/external/googletest" revision="master" />
-  <project path="external/google-benchmark" name="platform/external/google-benchmark" revision="db1632fadc79df388a2a7248157c965ee40248a1" />
+  <project path="external/googletest" name="platform/external/googletest"  />
+  <project path="external/google-benchmark" name="platform/external/google-benchmark"  />
   <project path="external/google-breakpad" name="platform/external/google-breakpad" />
   <project path="external/grpc" name="platform/external/grpc-grpc" />
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libvpx" name="platform/external/libvpx" />
-  <project path="external/libyuv" name="platform/external/libyuv" revision="master"/>
+  <project path="external/libyuv" name="platform/external/libyuv" />
   <project path="external/libpng" name="platform/external/libpng" />
   <project path="external/lz4" name="platform/external/lz4" />
   <project path="external/openssl" name="platform/external/openssl" />
@@ -46,12 +43,12 @@
   <project path="external/qt" name="platform/external/qt" />
   <project path="external/sdl2" name="platform/external/sdl2" />
   <project path="external/swiftshader" name="platform/external/swiftshader"/>
-  <project path="external/tinyobjloader" name="platform/external/tinyobjloader" revision="master"/>
-  <project path="external/virglrenderer" name="platform/external/virglrenderer" revision="crosvm-master"/>
+  <project path="external/tinyobjloader" name="platform/external/tinyobjloader" />
+  <project path="external/virglrenderer" name="platform/external/virglrenderer" />
   <project path="external/nasm" name="platform/external/nasm" />
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="lollipop-release" />
+  <project path="frameworks/native" name="platform/frameworks/native"  />
   <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" />
   <project path="prebuilts/android-emulator-build/archive" name="platform/prebuilts/android-emulator-build/archive" clone-depth="1" />
   <project path="prebuilts/android-emulator-build/common" name="platform/prebuilts/android-emulator-build/common" clone-depth="1" />
@@ -61,44 +58,39 @@
   <project path="prebuilts/android-emulator-build/protobuf" name="platform/prebuilts/android-emulator-build/protobuf" clone-depth="1" />
   <project path="prebuilts/android-emulator-build/qemu-android-deps" name="platform/prebuilts/android-emulator-build/qemu-android-deps" clone-depth="1" />
   <project path="prebuilts/android-emulator-build/qt" name="platform/prebuilts/android-emulator-build/qt" clone-depth="1" />
-
-  <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="master" />
-  <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="master" />
-  <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" revision="master" />
+  <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1"  />
+  <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1"  />
+  <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1"  />
   <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" />
   <project path="prebuilts/cmake/windows-x86" name="platform/prebuilts/cmake/windows-x86" clone-depth="1" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1"  />
   <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1" />
   <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1" />
   <project path="prebuilts/ninja/windows-x86" name="platform/prebuilts/ninja/windows-x86" clone-depth="1" />
-  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" clone-depth="1" revision="master" />
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="master" />
+  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" clone-depth="1"  />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1"  />
   <project path="sdk" name="platform/sdk" />
   <project path="tools/emulator" name="platform/tools/emulator" />
-  <project path="tools/acloud" name="platform/tools/acloud" revision="master" />
+  <project path="tools/acloud" name="platform/tools/acloud"  />
   <project path="tools/external/gradle" name="platform/tools/external/gradle"/>
   <project path="tools/gradle" name="platform/tools/gradle" />
-
-  <project path="prebuilts/rust" name="platform/prebuilts/rust" clone-depth="1" revision="master" />
-  <project path="external/rust/crates/bitflags" name="platform/external/rust/crates/bitflags" revision="master" />
-  <project path="external/rust/crates/byteorder" name="platform/external/rust/crates/byteorder" revision="master" />
-  <project path="external/rust/crates/libc" name="platform/external/rust/crates/libc" revision="master" />
-  <project path="external/rust/crates/proc-macro2" name="platform/external/rust/crates/proc-macro2" revision="master" />
-  <project path="external/rust/crates/quote" name="platform/external/rust/crates/quote" revision="master" />
-  <project path="external/rust/crates/remain" name="platform/external/rust/crates/remain" revision="master" />
-  <project path="external/rust/crates/syn" name="platform/external/rust/crates/syn" revision="master" />
-  <project path="external/rust/crates/unicode-xid" name="platform/external/rust/crates/unicode-xid" revision="master" />
-
-  <project name="platform/external/adhd" path="third_party/adhd" revision="crosvm-master"/>
-  <project name="platform/external/crosvm" path="platform/crosvm" revision="crosvm-master"/>
-  <project name="platform/external/libepoxy" path="third_party/libepoxy" revision="crosvm-master"/>
-  <project name="platform/external/minigbm" path="third_party/minigbm" revision="crosvm-master"/>
-
-  <project name="platform/external/minijail" path="aosp/external/minijail" revision="master"/>
-  <project name="platform/external/libcap" path="external/libcap" revision="master"/>
-  <project name="platform/external/libdrm" path="external/libdrm" revision="master"/>
-
-  <project name="device/google/cuttlefish_vmm" path="device/google/cuttlefish_vmm" revision="master"/>
-  <project name="device/google/cuttlefish" path="device/google/cuttlefish" revision="master"/>
+  <project path="prebuilts/rust" name="platform/prebuilts/rust" clone-depth="1"  />
+  <project path="external/rust/crates/bitflags" name="platform/external/rust/crates/bitflags"  />
+  <project path="external/rust/crates/byteorder" name="platform/external/rust/crates/byteorder"  />
+  <project path="external/rust/crates/libc" name="platform/external/rust/crates/libc"  />
+  <project path="external/rust/crates/proc-macro2" name="platform/external/rust/crates/proc-macro2"  />
+  <project path="external/rust/crates/quote" name="platform/external/rust/crates/quote"  />
+  <project path="external/rust/crates/remain" name="platform/external/rust/crates/remain"  />
+  <project path="external/rust/crates/syn" name="platform/external/rust/crates/syn"  />
+  <project path="external/rust/crates/unicode-xid" name="platform/external/rust/crates/unicode-xid"  />
+  <project name="platform/external/adhd" path="third_party/adhd" />
+  <project name="platform/external/crosvm" path="platform/crosvm" />
+  <project name="platform/external/libepoxy" path="third_party/libepoxy" />
+  <project name="platform/external/minigbm" path="third_party/minigbm" />
+  <project name="platform/external/minijail" path="aosp/external/minijail" />
+  <project name="platform/external/libcap" path="external/libcap" />
+  <project name="platform/external/libdrm" path="external/libdrm" />
+  <project name="device/google/cuttlefish_vmm" path="device/google/cuttlefish_vmm" />
+  <project name="device/google/cuttlefish" path="device/google/cuttlefish" />
 </manifest>