Merge branch 'emu-master-dev' into emu-master-qemu

This makes sure the emu-master-qemu branch is up to date with
emu-master-dev

Change-Id: I60c2570377cba55efef4a420dbe42029e67041c7

1 files changed, 19 insertions, 27 deletions

diff --git a/default.xml b/default.xml
index d3fda03bf..322662d3f 100644
--- a/default.xml
+++ b/default.xml
@@ -9,57 +9,40 @@
            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" />
-    <copyfile src="base/settings.gradle"   dest="tools/settings.gradle" />
-    <copyfile src="base/gradlew"           dest="tools/gradlew" />
-    <copyfile src="base/gradlew.bat"       dest="tools/gradlew.bat" />
-    <copyfile src="base/gradle.properties" dest="tools/gradle.properties" />
-  </project>
+  <project path="tools/buildSrc" name="platform/tools/buildSrc" />
 
   <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="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/gtest" name="platform/external/gtest" revision="master" />
-  <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/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/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/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/libusb" name="platform/external/libusb" />
+  <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" />
-  <project path="external/pixman" name="platform/external/pixman" />
   <project path="external/protobuf" name="platform/external/protobuf" />
+  <project path="external/perfetto" name="platform/external/perfetto" revision="37518c39e3db120322359090db3d54f6ac100078"/>
   <project path="external/qemu" name="platform/external/qemu">
     <copyfile src="android/vscode/emu.code-workspace" dest="emu.code-workspace"/>
   </project>
-  <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" />
+  <project path="external/virglrenderer" name="platform/external/virglrenderer" revision="crosvm-master"/>
   <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="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" />
+  <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" clone-depth="1" />
   <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" />
-  <project path="prebuilts/android-emulator-build/curl" name="platform/prebuilts/android-emulator-build/curl" clone-depth="1" />
   <project path="prebuilts/android-emulator-build/mesa" name="platform/prebuilts/android-emulator-build/mesa" clone-depth="1" />
   <project path="prebuilts/android-emulator-build/mesa-deps" name="platform/prebuilts/android-emulator-build/mesa-deps" clone-depth="1" />
-  <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" />
 
@@ -70,15 +53,24 @@
   <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-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" clone-depth="1" revision="master" />
   <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="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/external/gradle" name="platform/tools/external/gradle"/>
-  <project path="tools/gradle" name="platform/tools/gradle" />
+  <project name="device/google/cuttlefish" path="device/google/cuttlefish" revision="master"/>
+
+  <!-- Bring in the root-canal, bluetooth dependencies -->
+  <project path="system/bt" name="platform/system/bt"  groups="pdk" revision="master"/>
+  <project path="external/libchrome" name="platform/external/libchrome" groups="pdk" revision="emu-master-dev"/>
+
+  <!-- toolchain requirements for root-canal -->
+  <project path="external/bison" name="platform/external/bison" groups="pdk" revision="master"/>
+  <project path="external/flex" name="platform/external/flex" groups="pdk" revision="master"/>
+  <project path="external/m4" name="toolchain/m4" groups="pdk" revision="master"/>
+
+  <!-- Webrtc for the goldfish-webrtc-videobridge -->
+  <project path="external/webrtc" name="platform/external/webrtc" />
 </manifest>