Merge branch 'common-android15-6.6' into common-android15-6.6-desktop
Bug: 407967342
Change-Id: Ia7a2102aef4388a123c2b8c803e82bd7244be286
Signed-off-by: Slawomir Rosek <srosek@google.com>
diff --git a/default.xml b/default.xml
index cc25072..97375d7 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
<remote name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
<default revision="main-kernel-build-2024" remote="aosp" sync-j="4" />
- <superproject name="kernel/superproject" remote="aosp" revision="common-android15-6.6" />
+ <superproject name="kernel/superproject" remote="aosp" revision="common-android15-6.6-desktop" />
<project path="build/kernel" name="kernel/build" groups="ddk" >
<linkfile src="kleaf/bazel.sh" dest="tools/bazel" />
@@ -12,7 +12,7 @@
<linkfile src="kleaf/bzlmod/bazel.WORKSPACE.bzlmod" dest="WORKSPACE.bzlmod" />
</project>
<project path="build/bazel_common_rules" name="platform/build/bazel_common_rules" groups="ddk" />
- <project path="common" name="kernel/common" revision="android15-6.6" >
+ <project path="common" name="kernel/common" revision="android15-6.6-desktop" >
<linkfile src=".bazelignore" dest=".bazelignore" />
</project>
<project path="kernel/configs" name="kernel/configs" revision="main"/>
@@ -23,7 +23,7 @@
</project>
<project path="common-modules/trusty" name="kernel/common-modules/trusty" />
<project path="common-modules/virtio-media" name="platform/external/virtio-media" />
- <project path="common-modules/virtual-device" name="kernel/common-modules/virtual-device" revision="android15-6.6" />
+ <project path="common-modules/virtual-device" name="kernel/common-modules/virtual-device" revision="android15-6.6-desktop" />
<project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" groups="ddk" />
<project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" groups="ddk" />
<project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" groups="ddk" />
