diff options
author | Xin Li <delphij@google.com> | 2023-07-31 09:32:07 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-07-31 09:32:07 -0700 |
commit | 8338799fdd5111a45a14fdce2c953edc5291b617 (patch) | |
tree | 281bad0d8eb5fd27737b54855ce8ca46e4fe8f03 | |
parent | ddd41260512c2a0e693d69331d5b1cf345869097 (diff) | |
download | manifest-8338799fdd5111a45a14fdce2c953edc5291b617.tar.gz |
DO NOT MERGE ANYWHERE - Update studio-1.3-dev to use main branch.studio-1.3-dev
Bug: b/289400079
Change-Id: I36333590641418973127ea2ddaad06cf7f3fec36
-rw-r--r-- | default.xml | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/default.xml b/default.xml index 3451654b1..aa834c463 100644 --- a/default.xml +++ b/default.xml @@ -16,11 +16,11 @@ <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" groups="gpu" /> - <project path="external/emma" name="platform/external/emma" revision="master"/> - <project path="external/gmock" name="platform/external/gmock" revision="master" groups="gpu" /> + <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" groups="gpu" /> + <project path="external/emma" name="platform/external/emma" revision="main"/> + <project path="external/gmock" name="platform/external/gmock" revision="main" groups="gpu" /> <project path="external/protobuf" name="platform/external/protobuf" /> <project path="external/qemu" name="platform/external/qemu" /> <project path="external/qemu-android" name="platform/external/qemu-android" /> @@ -30,32 +30,32 @@ <project path="prebuilts/android-emulator-build/mesa" name="platform/prebuilts/android-emulator-build/mesa" clone-depth="1" /> <project path="prebuilts/android-emulator-build/mesa-deps" name="platform/prebuilts/android-emulator-build/mesa-deps" 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/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="master" groups="gpu" /> - <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" groups="gpu" /> - <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" groups="gpu" /> + <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="main" groups="gpu" /> + <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" groups="gpu" /> + <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" groups="gpu" /> <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="gpu" /> <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="gpu" /> <project path="prebuilts/go/windows-x86" name="platform/prebuilts/go/windows-x86" groups="gpu" /> - <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" 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/gpu/src/android.googlesource.com/platform/tools/gpu" name="platform/tools/gpu" groups="gpu" /> - <project path="tools/gpu/src/github.com/go-gl-legacy/gl" name="platform/tools/external/go/src/github.com/go-gl-legacy/gl" revision="master" groups="gpu" /> - <project path="tools/gpu/src/github.com/go-gl/glfw" name="platform/tools/external/go/src/github.com/go-gl/glfw" revision="master" groups="gpu" /> - <project path="tools/gpu/src/github.com/golang/protobuf" name="platform/tools/external/go/src/github.com/golang/protobuf" revision="master" groups="gpu" /> - <project path="tools/gpu/src/golang.org/x/net" name="platform/tools/external/go/src/golang.org/x/net" revision="master" groups="gpu" /> - <project path="tools/gpu/src/golang.org/x/tools" name="platform/tools/external/go/src/golang.org/x/tools" revision="master" groups="gpu" /> + <project path="tools/gpu/src/github.com/go-gl-legacy/gl" name="platform/tools/external/go/src/github.com/go-gl-legacy/gl" revision="main" groups="gpu" /> + <project path="tools/gpu/src/github.com/go-gl/glfw" name="platform/tools/external/go/src/github.com/go-gl/glfw" revision="main" groups="gpu" /> + <project path="tools/gpu/src/github.com/golang/protobuf" name="platform/tools/external/go/src/github.com/golang/protobuf" revision="main" groups="gpu" /> + <project path="tools/gpu/src/golang.org/x/net" name="platform/tools/external/go/src/golang.org/x/net" revision="main" groups="gpu" /> + <project path="tools/gpu/src/golang.org/x/tools" name="platform/tools/external/go/src/golang.org/x/tools" revision="main" groups="gpu" /> <project path="tools/gradle" name="platform/tools/gradle" /> <project path="tools/idea" name="platform/tools/idea" revision="idea14-1.3-dev" /> <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" /> |