From da371998f18a0290e26a314a0413a5996435fde9 Mon Sep 17 00:00:00 2001
From: "android-build-prod (mdb)" <android-build-team-robot@google.com>
Date: Wed, 15 Aug 2018 22:46:45 +0000
Subject: [PATCH] DO NOT MERGE ANYWHERE Create manifest for
emu-master-qemu-release
Change-Id: If620479a057aefa16831742c2c4319d690f98313
BUG: 112467361
---
default.xml | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/default.xml b/default.xml
index da1044c1..06709dfc 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-master-qemu-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" revision="emu-master-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/qemu" name="platform/external/qemu" />
+ <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,21 +31,20 @@
<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/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/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" 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.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>
--
GitLab