summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2017-11-28 22:35:57 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2017-11-28 22:36:02 +0000
commit68be81303c7f47989f67dd9939906eea13a71146 (patch)
tree764dfb99d0b27d24ab506509450b395585570176
parent82d55d4cf2e710c9cd3eae343473f801ae16b21e (diff)
downloadmanifest-68be81303c7f47989f67dd9939906eea13a71146.tar.gz
DO NOT MERGE ANYWHERE Create manifest for emu-2.6-release
Change-Id: I1fc5f616090d5a0e89e130d6493664dbc6a14181 BUG: 69851688
-rw-r--r--default.xml36
1 files changed, 16 insertions, 20 deletions
diff --git a/default.xml b/default.xml
index 26a91d563..698997f4b 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="emu-2.6-release"
remote="aosp"
sync-j="4" />
-
<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" />
@@ -15,16 +13,15 @@
<copyfile src="base/gradlew.bat" dest="tools/gradlew.bat" />
<copyfile src="base/gradle.properties" dest="tools/gradle.properties" />
</project>
-
<project path="external/angle" name="platform/external/angle" />
<project path="external/adt-infra" name="platform/external/adt-infra" />
- <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/libyuv" name="platform/external/libyuv" revision="master"/>
+ <project path="external/gtest" name="platform/external/gtest" />
+ <project path="external/google-benchmark" name="platform/external/google-benchmark" />
+ <project path="external/libyuv" name="platform/external/libyuv" />
<project path="external/protobuf" name="platform/external/protobuf" />
<project path="external/qemu" name="platform/external/qemu" />
- <project path="external/tinyobjloader" name="platform/external/tinyobjloader" revision="master"/>
- <project path="frameworks/native" name="platform/frameworks/native" revision="lollipop-release" />
+ <project path="external/tinyobjloader" name="platform/external/tinyobjloader" />
+ <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" />
@@ -34,25 +31,24 @@
<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/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" 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/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-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-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-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-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>