summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.xml38
1 files changed, 22 insertions, 16 deletions
diff --git a/default.xml b/default.xml
index 7a3073bd3..b6b13fc39 100644
--- a/default.xml
+++ b/default.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
+<!--
+ This branch is a master side branch, but is not to be setup for testing
+ as documented in go/side-branch-testing. This is because the Cuttlefish
+ branches use a different branching strategy, please see
+ go/cuttlefish-branching-proposal for details.
+-->
<remote name="aosp"
fetch=".."
@@ -46,7 +52,7 @@
<project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk" />
<project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk" />
<project path="device/generic/mini-emulator-x86_64" name="device/generic/mini-emulator-x86_64" groups="pdk" />
- <project path="device/generic/opengl-transport" name="device/generic/opengl-transport" groups="pdk" />
+ <project path="device/generic/opengl-transport" name="device/generic/opengl-transport" groups="pdk" revision="cuttlefish-testing" />
<project path="device/generic/qemu" name="device/generic/qemu" groups="pdk" />
<project path="device/generic/trusty" name="device/generic/trusty" groups="pdk" />
<project path="device/generic/uml" name="device/generic/uml" groups="device,pdk" />
@@ -60,10 +66,10 @@
<project path="device/google/crosshatch" name="device/google/crosshatch" groups="device,crosshatch" />
<project path="device/google/crosshatch-kernel" name="device/google/crosshatch-kernel" groups="device,crosshatch" clone-depth="1" />
<project path="device/google/crosshatch-sepolicy" name="device/google/crosshatch-sepolicy" groups="device,crosshatch" />
- <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk" />
- <project path="device/google/cuttlefish_common" name="device/google/cuttlefish_common" groups="device,pdk" />
- <project path="device/google/cuttlefish_kernel" name="device/google/cuttlefish_kernel" groups="device,pdk" clone-depth="1" />
- <project path="device/google/cuttlefish_vmm" name="device/google/cuttlefish_vmm" groups="device,pdk" clone-depth="1" />
+ <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk" revision="master-cuttlefish-testing" />
+ <project path="device/google/cuttlefish_common" name="device/google/cuttlefish_common" groups="device,pdk" revision="cuttlefish-testing" />
+ <project path="device/google/cuttlefish_kernel" name="device/google/cuttlefish_kernel" groups="device,pdk" clone-depth="1" revision="master-cuttlefish-testing" />
+ <project path="device/google/cuttlefish_vmm" name="device/google/cuttlefish_vmm" groups="device,pdk" clone-depth="1" revision="cuttlefish-testing" />
<project path="device/google/fuchsia" name="device/google/fuchsia" groups="device" />
<project path="device/google/marlin" name="device/google/marlin" groups="device,marlin,pdk" />
<project path="device/google/marlin-kernel" name="device/google/marlin-kernel" groups="device,marlin,pdk" clone-depth="1" />
@@ -390,8 +396,8 @@
<project path="external/squashfs-tools" name="platform/external/squashfs-tools" groups="pdk" />
<project path="external/strace" name="platform/external/strace" groups="pdk" />
<project path="external/stressapptest" name="platform/external/stressapptest" groups="pdk" />
- <project path="external/swiftshader" name="platform/external/swiftshader" groups="pdk" />
- <project path="external/syzkaller" name="platform/external/syzkaller" groups="projectarch,pdk" />
+ <project path="external/swiftshader" name="platform/external/swiftshader" groups="pdk" revision="cuttlefish-testing" />
+ <project path="external/syzkaller" name="platform/external/syzkaller" groups="projectarch" />
<project path="external/tagsoup" name="platform/external/tagsoup" groups="pdk" />
<project path="external/tcpdump" name="platform/external/tcpdump" groups="pdk" />
<project path="external/tensorflow" name="platform/external/tensorflow" groups="pdk" />
@@ -411,7 +417,7 @@
<project path="external/v4l2_codec2" name="platform/external/v4l2_codec2" groups="pdk" />
<project path="external/v8" name="platform/external/v8" groups="pdk" />
<project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot,pdk-fs" />
- <project path="external/virglrenderer" name="platform/external/virglrenderer" groups="pdk" />
+ <project path="external/virglrenderer" name="platform/external/virglrenderer" groups="pdk" revision="cuttlefish-testing" />
<project path="external/vixl" name="platform/external/vixl" groups="pdk" />
<project path="external/vogar" name="platform/external/vogar" groups="pdk" />
<project path="external/volley" name="platform/external/volley" groups="pdk" />
@@ -718,18 +724,18 @@
<project path="test/mlts/models" name="platform/test/mlts/models" groups="pdk" />
<project path="test/mts" name="platform/test/mts" />
<project path="test/suite_harness" name="platform/test/suite_harness" groups="cts,pdk-cw-fs,pdk-fs" />
- <project path="test/vti/alert" name="platform/test/vti/alert" groups="vts,projectarch,pdk" />
- <project path="test/vti/dashboard" name="platform/test/vti/dashboard" groups="vts,projectarch,pdk" />
- <project path="test/vti/fuzz_test_serving" name="platform/test/vti/fuzz_test_serving" groups="vts,projectarch,pdk" />
- <project path="test/vti/test_serving" name="platform/test/vti/test_serving" groups="vts,projectarch,pdk" />
+ <project path="test/vti/alert" name="platform/test/vti/alert" groups="vts,projectarch" />
+ <project path="test/vti/dashboard" name="platform/test/vti/dashboard" groups="vts,projectarch" />
+ <project path="test/vti/fuzz_test_serving" name="platform/test/vti/fuzz_test_serving" groups="vts,projectarch" />
+ <project path="test/vti/test_serving" name="platform/test/vti/test_serving" groups="vts,projectarch" />
<project path="test/vts" name="platform/test/vts" groups="vts,pdk" />
- <project path="test/vts-testcase/fuzz" name="platform/test/vts-testcase/fuzz" groups="vts,projectarch,pdk" />
+ <project path="test/vts-testcase/fuzz" name="platform/test/vts-testcase/fuzz" groups="vts,projectarch" />
<project path="test/vts-testcase/hal" name="platform/test/vts-testcase/hal" groups="vts,pdk" />
<project path="test/vts-testcase/hal-trace" name="platform/test/vts-testcase/hal-trace" groups="vts,pdk" />
<project path="test/vts-testcase/kernel" name="platform/test/vts-testcase/kernel" groups="vts,pdk" />
- <project path="test/vts-testcase/nbu" name="platform/test/vts-testcase/nbu" groups="vts,projectarch,pdk" />
- <project path="test/vts-testcase/performance" name="platform/test/vts-testcase/performance" groups="vts,projectarch,pdk" />
- <project path="test/vts-testcase/security" name="platform/test/vts-testcase/security" groups="vts,projectarch,pdk" />
+ <project path="test/vts-testcase/nbu" name="platform/test/vts-testcase/nbu" groups="vts,projectarch" />
+ <project path="test/vts-testcase/performance" name="platform/test/vts-testcase/performance" groups="vts,projectarch" />
+ <project path="test/vts-testcase/security" name="platform/test/vts-testcase/security" groups="vts,projectarch" />
<project path="test/vts-testcase/vndk" name="platform/test/vts-testcase/vndk" groups="vts,pdk" />
<project path="toolchain/benchmark" name="toolchain/benchmark" />
<project path="toolchain/pgo-profiles" name="toolchain/pgo-profiles" groups="pdk" />