summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-07-31 09:32:06 -0700
committerXin Li <delphij@google.com>2023-07-31 09:32:06 -0700
commita8dddbf281092a6b27ef91a67ea91b678a904706 (patch)
treedacf02c197e9293b51a83bd305569c4618392912
parent06e5a719cfdebfc34d85a9d0b2fc00e668ac5fe3 (diff)
downloadmanifest-studio-1.2-dev.tar.gz
DO NOT MERGE ANYWHERE - Update studio-1.2-dev to use main branch.studio-1.2-dev
Bug: b/289400079 Change-Id: Ief175c94666140d606dacd53d937efe4d7accfc1
-rw-r--r--default.xml32
1 files changed, 16 insertions, 16 deletions
diff --git a/default.xml b/default.xml
index 73e2a692e..71fe1516f 100644
--- a/default.xml
+++ b/default.xml
@@ -16,32 +16,32 @@
<copyfile src="base/gradle.properties" dest="tools/gradle.properties" />
</project>
- <project path="external/ant-glob" name="platform/external/ant-glob" revision="master" />
- <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="master" />
- <project path="external/gtest" name="platform/external/gtest" revision="master" />
- <project path="external/emma" name="platform/external/emma" revision="master"/>
- <project path="external/protobuf" name="platform/external/protobuf" revision="master" />
+ <project path="external/ant-glob" name="platform/external/ant-glob" revision="main" />
+ <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="main" />
+ <project path="external/gtest" name="platform/external/gtest" revision="main" />
+ <project path="external/emma" name="platform/external/emma" revision="main"/>
+ <project path="external/protobuf" name="platform/external/protobuf" revision="main" />
<project path="external/qemu" name="platform/external/qemu" />
<project path="external/qemu-android" name="platform/external/qemu-android" />
<project path="frameworks/native" name="platform/frameworks/native" revision="lollipop-release" />
<project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" />
- <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="master" />
- <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" revision="master" />
- <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" revision="master" />
- <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" revision="master" />
- <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="master"/>
- <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" 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" 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/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="master" />
- <project path="prebuilts/tools" name="platform/prebuilts/tools" revision="master" />
+ <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="main" />
+ <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" revision="main" />
+ <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" revision="main" />
+ <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" revision="main" />
+ <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="main"/>
+ <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" revision="main" />
+ <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="main" />
+ <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="main" />
+ <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="main" />
+ <project path="prebuilts/tools" name="platform/prebuilts/tools" revision="main" />
<project path="sdk" name="platform/sdk" />
<project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" />
<project path="tools/adt/idea" name="platform/tools/adt/idea" />
<project path="tools/base" name="platform/tools/base" />
<project path="tools/emulator" name="platform/tools/emulator" />
<project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" />
- <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="master"/>
+ <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="main"/>
<project path="tools/gradle" name="platform/tools/gradle" />
<project path="tools/idea" name="platform/tools/idea" revision="idea14-1.2-dev" />
<project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" />