diff options
| author | Erwin Jansen <jansene@google.com> | 2020-01-30 13:31:49 -0800 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2020-01-30 13:31:49 -0800 |
| commit | d3963f4d54dca0b6c50b237a647fe261dc323e3c (patch) | |
| tree | 45e96fe32fd26cd75f347cd34f0006fa47786e57 | |
| parent | 35b390b288884f3bb7e71caf03cac9c0595ac42a (diff) | |
| parent | 6318d70ad7f26078205f64f6f7d1524f12bc4a05 (diff) | |
| download | manifest-d3963f4d54dca0b6c50b237a647fe261dc323e3c.tar.gz | |
Merge in emu-master-dev
It seems we have gotten out of sync, causing build breaks.
Change-Id: Id46b11f249c0e353548e9534fd85e27555cc7999
| -rw-r--r-- | default.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/default.xml b/default.xml index 8d9a8f50c..d3fda03bf 100644 --- a/default.xml +++ b/default.xml @@ -18,20 +18,22 @@ </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="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/libunwind_llvm" name="platform/external/libunwind_llvm" revision="master" /> <project path="external/libvpx" name="platform/external/libvpx" /> <project path="external/libyuv" name="platform/external/libyuv" revision="master"/> <project path="external/libpng" name="platform/external/libpng" /> @@ -47,7 +49,8 @@ <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/yasm" name="platform/external/chromium_org/third_party/yasm/source/patched-yasm" /> + <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" /> @@ -66,7 +69,6 @@ <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.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-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" 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" /> |