diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-08-30 18:01:38 +0000 |
---|---|---|
committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-08-30 18:01:43 +0000 |
commit | b4c87308dc1ad96cb4be12d51fa9c700d3985be2 (patch) | |
tree | c9e4c91ca4e0c4365ab52cba6b6e1b101d7e9777 | |
parent | 86448d8fa79ab9978616adbad58df4b49f692d88 (diff) | |
download | manifest-b4c87308dc1ad96cb4be12d51fa9c700d3985be2.tar.gz |
DO NOT MERGE ANYWHERE Create manifest for emu-2.5-release
Change-Id: I32def72b75602ed9097ab3a7fef2e6116b77f9a0
BUG: 65160605
-rw-r--r-- | default.xml | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/default.xml b/default.xml index dfe2d0565..7cf4febd0 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.5-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,14 +13,13 @@ <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/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" /> @@ -32,25 +29,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> |