summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-07-31 09:31:57 -0700
committerXin Li <delphij@google.com>2023-07-31 09:31:57 -0700
commit177f6c82d4f8333c82335af6f77e688767e6fb0a (patch)
tree2737eda43b932cb79b334395175834c27113bfa2
parenteda805d13cf22f527ca6e0030206e3c4aff52bcc (diff)
downloadmanifest-emu-gn-dev.tar.gz
DO NOT MERGE ANYWHERE - Update emu-gn-dev to use main branch.emu-gn-dev
Bug: b/289400079 Change-Id: Iec142e2b49c48b3b97626b2ff798c375c875a60d
-rw-r--r--default.xml20
1 files changed, 10 insertions, 10 deletions
diff --git a/default.xml b/default.xml
index 6d94a1365..078ae3280 100644
--- a/default.xml
+++ b/default.xml
@@ -18,12 +18,12 @@
<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/gtest" name="platform/external/gtest" revision="main" />
<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/libyuv" name="platform/external/libyuv" revision="main"/>
<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="external/tinyobjloader" name="platform/external/tinyobjloader" revision="main"/>
<project path="frameworks/native" name="platform/frameworks/native" revision="lollipop-release" />
<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" />
@@ -34,21 +34,21 @@
<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" revision="main" />
+ <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="main" />
<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" 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/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" revision="main" />
+ <project path="prebuilts/tools" name="platform/prebuilts/tools" revision="main" />
<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" revision="main"/>
<project path="tools/gradle" name="platform/tools/gradle" />
</manifest>