From 0b6141be00b2941155d7672d6c7174e7d7a414d8 Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Fri, 5 Mar 2021 16:46:53 +0000
Subject: [PATCH 1/4] add superproject tag

Bug: 181627166
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: I7645927e1b377a0fb1b70fd51a279da9c84a862e
---
 default.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default.xml b/default.xml
index 97e90fe..2c90029 100644
--- a/default.xml
+++ b/default.xml
@@ -3,6 +3,8 @@
   <remote  name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
   <default revision="master" remote="aosp" sync-j="4" />
 
+  <superproject name="kernel/superproject" remote="aosp"/>
+
   <project path="build" name="kernel/build" />
   <project path="hikey-modules" name="kernel/hikey-modules" revision="android12-5.10" />
   <project path="common" name="kernel/common" revision="android12-5.10" />

From 8cba5a25f99fa4f2690783330599b81b825a0421 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Thu, 13 May 2021 12:57:52 -0700
Subject: [PATCH 2/4] Remove GNU AS from build dependencies

Step 9/Final Step of:
https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/BINUTILS_KERNEL_DEPRECATION.md

Bug: 141693040
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: I54f595c592b0320d8446c69ac5919acecbcfc818
---
 default.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/default.xml b/default.xml
index 2c90029..72ba97e 100644
--- a/default.xml
+++ b/default.xml
@@ -14,7 +14,6 @@
   <project path="kernel/tests" name="kernel/tests" />
   <project path="kernel/configs" name="kernel/configs" revision="master" />
   <project path="common-modules/virtual-device" name="kernel/common-modules/virtual-device" revision="android12-5.10" />
-  <project path="prebuilts/gas/linux-x86" name="platform/prebuilts/gas/linux-x86" clone-depth="1" />
   <project path="prebuilts-master/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" 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" clone-depth="1" />
   <project path="prebuilts/boot-artifacts" name="platform/prebuilts/boot-artifacts" />

From daa4f8a525e876ab197d435895b40bf5d324c491 Mon Sep 17 00:00:00 2001
From: Peter Yoon <peyo.hd@gmail.com>
Date: Sun, 7 Feb 2021 17:38:48 +0900
Subject: [PATCH 3/4] arpi-5.10 : switch to android-rpi branch

Change-Id: Ia5e8877db40ad3fdd0c62e76a6160b36bbe462a1
---
 README      | 19 +++++++++++++++++++
 default.xml |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..46dd1b9
--- /dev/null
+++ b/README
@@ -0,0 +1,19 @@
+# Download Kernel source
+ Refer to https://source.android.com/setup/build/building-kernels
+
+ Make separate kernel directory apart from Android source.
+
+  $ cd <kernel directory>
+  $ repo init -u https://github.com/android-rpi/kernel_manifest -b arpi-5.10
+  $ repo sync
+ 
+# Build Kernel
+  $ build/build.sh
+
+  Output files are under out/arpi-5.10/dist/
+    Image.gz
+    bcm2711-rpi-*.dtb
+    vc4-kms-v3d-pi4.dtbo
+
+# Build Android for Raspberry Pi 4
+ https://github.com/android-rpi/device_arpi_rpi4
diff --git a/default.xml b/default.xml
index 72ba97e..a6b8f0f 100644
--- a/default.xml
+++ b/default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
+  <remote  name="aosp" fetch="https://android.googlesource.com" review="https://android-review.googlesource.com/" />
   <default revision="master" remote="aosp" sync-j="4" />
 
   <superproject name="kernel/superproject" remote="aosp"/>
@@ -20,4 +20,10 @@
   <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" />
   <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" />
   <project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" />
+
+  <remote  name="arpi" fetch="."/>
+  <remove-project name="kernel/common"/>
+  <project path="common" name="kernel_arpi" revision="arpi-5.10" remote="arpi">
+      <linkfile src="build.config.arpi" dest="build.config"/>
+  </project>
 </manifest>

From e16cd04638759bf6d2d4bf3f8a75979ff6566a74 Mon Sep 17 00:00:00 2001
From: Matthias Lange <matthias.lange@kernkonzept.com>
Date: Sat, 19 Mar 2022 17:46:26 +0100
Subject: [PATCH 4/4] Align default revision with Android version

Certain projects may move forward on their master branch breaking
compatibility with other Android-version-specific projects. This happend
e.g. with the 'kernel/build' project where on the master branch certain
path' and locations have changed.

Thus we have to pin the default revision to the Android and kernel
version we want to build for. This also fixes issue #7.

Change-Id: Icf22094caf3521d506acaeb9a3c3f9265d1a877f
---
 default.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.xml b/default.xml
index a6b8f0f..138c64b 100644
--- a/default.xml
+++ b/default.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <remote  name="aosp" fetch="https://android.googlesource.com" review="https://android-review.googlesource.com/" />
-  <default revision="master" remote="aosp" sync-j="4" />
+  <default revision="master-kernel-build-2021" remote="aosp" sync-j="4" />
 
   <superproject name="kernel/superproject" remote="aosp"/>
 
   <project path="build" name="kernel/build" />
   <project path="hikey-modules" name="kernel/hikey-modules" revision="android12-5.10" />
   <project path="common" name="kernel/common" revision="android12-5.10" />
-  <project path="kernel/common-patches" name="kernel/common-patches" >
+  <project path="kernel/common-patches" name="kernel/common-patches" revision="master">
       <linkfile src="android-mainline" dest="common/patches" />
   </project>
   <project path="kernel/tests" name="kernel/tests" />
@@ -19,7 +19,7 @@
   <project path="prebuilts/boot-artifacts" name="platform/prebuilts/boot-artifacts" />
   <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" />
   <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" />
-  <project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" />
+  <project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" revision="master" />
 
   <remote  name="arpi" fetch="."/>
   <remove-project name="kernel/common"/>