summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShirley Yuen <shirleyshukyee@google.com>2017-03-27 10:48:47 -0700
committerShirley Yuen <shirleyshukyee@google.com>2017-03-27 10:48:47 -0700
commitc2be79d58efbd64e04be2b4bd8fd4a6afecc9959 (patch)
tree97bcd63638adf39e80597acf3835492ae1512bcc
parentab5badea737a3bade4a74a66ccec22f18577fc05 (diff)
downloadmanifest-c2be79d58efbd64e04be2b4bd8fd4a6afecc9959.tar.gz
DO NOT MERGE ANYWHERE Add manifest for emu-2.4-release [ts:1490636828].
BUG: 36632287
-rw-r--r--default.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/default.xml b/default.xml
index 527b00c04..bda2975a3 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
<remote name="aosp"
fetch=".."
review="https://android-review.googlesource.com/" />
- <default revision="emu-master-dev"
+ <default revision="emu-2.4-release"
remote="aosp"
sync-j="4" />
@@ -17,11 +17,11 @@
</project>
<project path="external/angle" name="platform/external/angle" />
- <project path="external/gtest" name="platform/external/gtest" revision="master" />
- <project path="external/google-benchmark" name="platform/external/google-benchmark" revision="db1632fadc79df388a2a7248157c965ee40248a1" />
+ <project path="external/gtest" name="platform/external/gtest" />
+ <project path="external/google-benchmark" name="platform/external/google-benchmark" />
<project path="external/protobuf" name="platform/external/protobuf" />
<project path="external/qemu" name="platform/external/qemu" />
- <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" />
@@ -31,22 +31,22 @@
<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/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" clone-depth="1" revision="master" />
+ <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" clone-depth="1" />
<project path="prebuilts/clang/darwin-x86/host/3.6" name="platform/prebuilts/clang/darwin-x86/host/3.6" clone-depth="1" />
- <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" revision="master" />
+ <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" />
<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.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" 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" revision="master" />
+ <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" />
+ <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" />
<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" revision="master" />
- <project path="prebuilts/tools" name="platform/prebuilts/tools" revision="master" />
+ <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" />
+ <project path="prebuilts/tools" name="platform/prebuilts/tools" />
<project path="sdk" name="platform/sdk" />
<project path="tools/emulator" name="platform/tools/emulator" />
- <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="master"/>
+ <project path="tools/external/gradle" name="platform/tools/external/gradle" />
<project path="tools/gradle" name="platform/tools/gradle" />
</manifest>