diff options
| author | Will McVicker <willmcvicker@google.com> | 2022-02-01 23:32:37 -0800 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2022-02-01 23:33:01 -0800 |
| commit | d887f04eb9743c8f16d5f93f514bea510354c7e0 (patch) | |
| tree | 81af06d50e587c7c33f004b1bdd63ee28583c780 | |
| parent | 9f06a8196b101bfc921b7fabaa5b50c3c07db747 (diff) | |
| download | manifest-d887f04eb9743c8f16d5f93f514bea510354c7e0.tar.gz | |
Switch to android-mainline ToT
Quick before anything else breaks!
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I170ea19c523388a6d45a2e01f40975e5799c2b8b
| -rw-r--r-- | default.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/default.xml b/default.xml index 381fd61..f824007 100644 --- a/default.xml +++ b/default.xml @@ -5,8 +5,7 @@ <superproject name="kernel/superproject" remote="aosp" revision="gs-android-gs-raviole-mainline" /> - <!-- ACK tag: android-mainline-5.16 - 6e9d208fdc7b8 ("Merge 5.16 into android-mainline") --> - <project path="common" name="kernel/common" revision="6e9d208fdc7b831d223c4d9b9e6a776adaa2fd45" /> + <project path="common" name="kernel/common" revision="android-mainline" /> <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" /> @@ -51,8 +50,7 @@ <linkfile src="static_analysis" dest="build/static_analysis" /> </project> <project path="kernel/configs" name="kernel/configs" revision="master" /> - <!-- 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/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="master" 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" /> |