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 26895e9..97375d7 100644
--- a/default.xml
+++ b/default.xml
@@ -12,9 +12,17 @@
<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-desktop" />
- <project path="kernel/tests" name="kernel/tests" />
- <project path="kernel/configs" name="kernel/configs"/>
+ <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"/>
+ <project path="kernel/tests" name="kernel/tests" revision="main" >
+ <linkfile src="tools/run_test_only.sh" dest="run_test_only.sh" />
+ <linkfile src="tools/launch_cvd.sh" dest="launch_cvd.sh" />
+ <linkfile src="tools/flash_device.sh" dest="flash_device.sh" />
+ </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-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" />
@@ -22,11 +30,11 @@
<project path="prebuilts/clang-tools" name="platform/prebuilts/clang-tools" clone-depth="1" />
<project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" groups="ddk" />
<project path="prebuilts/rust" name="platform/prebuilts/rust" clone-depth="1" />
- <project path="prebuilts/tradefed" name="platform/tools/tradefederation/prebuilts" clone-depth="1" />
- <project path="prebuilts/asuite" name="platform/prebuilts/asuite" clone-depth="1" />
+ <project path="prebuilts/tradefed" name="platform/tools/tradefederation/prebuilts" revision="main" clone-depth="1" />
+ <project path="prebuilts/asuite" name="platform/prebuilts/asuite" revision="main" clone-depth="1" />
<project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" />
- <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" clone-depth="1" groups="ddk" />
+ <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" clone-depth="1" />
<project path="prebuilts/ndk-r26" name="toolchain/prebuilts/ndk/r26" clone-depth="1" groups="ddk" />
<project path="external/libcap-ng" name="platform/external/libcap-ng"/>
