summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Llamas <cmllamas@google.com>2022-01-20 12:56:56 -0800
committerCarlos Llamas <cmllamas@google.com>2022-01-25 10:52:36 -0800
commit9f06a8196b101bfc921b7fabaa5b50c3c07db747 (patch)
treef75e014b248e9500f9d479283df9f387ebd4f848
parent197decdd75e31015ffb1323a212f7ee28c5fab07 (diff)
downloadmanifest-9f06a8196b101bfc921b7fabaa5b50c3c07db747.tar.gz
Use android-mainline v5.16 release
Select tag "android-mainline-5.16" from ACK repo which points to commit 6e9d208fdc7b8 ("Merge 5.16 into android-mainline"). Also, pull an older prebuilts clang host repo as ACK depends on CLANG_VERSION=r437112 which has now been removed from master. Signed-off-by: Carlos Llamas <cmllamas@google.com> Change-Id: Ib815c5f60dff12f1ba31bff7efbe69cb49a16cc2
-rw-r--r--default.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/default.xml b/default.xml
index 6e8046d..381fd61 100644
--- a/default.xml
+++ b/default.xml
@@ -5,7 +5,8 @@
<superproject name="kernel/superproject" remote="aosp" revision="gs-android-gs-raviole-mainline" />
- <project path="common" name="kernel/common" revision="android13-5.15" />
+ <!-- ACK tag: android-mainline-5.16 - 6e9d208fdc7b8 ("Merge 5.16 into android-mainline") -->
+ <project path="common" name="kernel/common" revision="6e9d208fdc7b831d223c4d9b9e6a776adaa2fd45" />
<project path="gs/google-modules/soc-modules" name="kernel/google-modules/raviole-device" >
<linkfile src="build.config.slider" dest="build.config" />
<linkfile src="build_slider.sh" dest="build_slider.sh" />
@@ -50,7 +51,8 @@
<linkfile src="static_analysis" dest="build/static_analysis" />
</project>
<project path="kernel/configs" name="kernel/configs" revision="master" />
- <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="master" clone-depth="1" />
+ <!-- TODO(b/216121984): Switch revision back to master after ACK v5.16 dependency is resolved -->
+ <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="64ea0eeda920f7d9ebee086bade1963f115b0a4a" clone-depth="1" />
<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" revision="master" clone-depth="1" >
<!-- TODO(b/204425264): Remove unused scripts and unused symlinks -->
<linkfile src="sysroot" dest="build/build-tools/sysroot" />