Revert "Upgrade to android13-5.15 kernel"
Revert "Add Android.bp for microdroid"
Revert "Add Android.bp for microdroid"
Revert submission 2103024-microdroid_kernel_5_15
Reason for revert: Broke tests - see http://b/233317671#comment20
Reverted Changes:
Id1fe79c84:Upgrade to android13-5.15 kernel
Ia521c665d:Add Android.bp for microdroid
I570ca3cc4:Add Android.bp for microdroid
Change-Id: I41990cb01f13667f4331bea9357cbdfb2058b346
diff --git a/apex/Android.bp b/apex/Android.bp
index 4698088..0f30c67 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -4,9 +4,9 @@
microdroid_filesystem_images = [
"microdroid_super",
- "microdroid_boot",
+ "microdroid_boot-5.10",
"microdroid_init_boot",
- "microdroid_vendor_boot",
+ "microdroid_vendor_boot-5.10",
"microdroid_vbmeta",
"microdroid_vbmeta_bootconfig",
]
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 7bdbf50..a1e81d2 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -363,8 +363,8 @@
virt_apex_files = {
'bootloader.pubkey': 'etc/microdroid_bootloader.avbpubkey',
'bootloader': 'etc/microdroid_bootloader',
- 'boot.img': 'etc/fs/microdroid_boot.img',
- 'vendor_boot.img': 'etc/fs/microdroid_vendor_boot.img',
+ 'boot.img': 'etc/fs/microdroid_boot-5.10.img',
+ 'vendor_boot.img': 'etc/fs/microdroid_vendor_boot-5.10.img',
'init_boot.img': 'etc/fs/microdroid_init_boot.img',
'super.img': 'etc/fs/microdroid_super.img',
'vbmeta.img': 'etc/fs/microdroid_vbmeta.img',
diff --git a/docs/getting_started/index.md b/docs/getting_started/index.md
index 7eae02d..be97ad5 100644
--- a/docs/getting_started/index.md
+++ b/docs/getting_started/index.md
@@ -102,7 +102,7 @@
```shell
mkdir android-kernel && cd android-kernel
-repo init -u https://android.googlesource.com/kernel/manifest -b common-android13-5.15
+repo init -u https://android.googlesource.com/kernel/manifest -b common-android12-5.10
repo sync
FAST_BUILD=1 DIST_DIR=out/dist BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh -j80
```
@@ -113,7 +113,7 @@
Then copy the built kernel to the Android source tree.
```
-cp out/dist/Image <android_root>/kernel/prebuilts/5.15/arm64/kernel-5.15
+cp out/dist/Image <android_root>/kernel/prebuilts/5.10/arm64/kernel-5.10
```
Finally rebuild the `com.android.virt` APEX and install it by following the
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 4b804b1..8702568 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -240,17 +240,17 @@
]
bootimg {
- name: "microdroid_boot",
+ name: "microdroid_boot-5.10",
// We don't have kernel for arm and x86. But Soong demands one when it builds for
// arm or x86 target. Satisfy that by providing an empty file as the kernel.
kernel_prebuilt: "empty_kernel",
arch: {
arm64: {
- kernel_prebuilt: ":kernel_prebuilts-5.15-arm64",
+ kernel_prebuilt: ":kernel_prebuilts-5.10-arm64",
cmdline: microdroid_boot_cmdline,
},
x86_64: {
- kernel_prebuilt: ":kernel_prebuilts-5.15-x86_64",
+ kernel_prebuilt: ":kernel_prebuilts-5.10-x86_64",
cmdline: microdroid_boot_cmdline + [
// console=none is to work around the x86 specific u-boot behavior which when
// console= option is not found in the kernel commandline console=ttyS0 is
@@ -272,7 +272,7 @@
bootimg {
name: "microdroid_init_boot",
- ramdisk_module: "microdroid_ramdisk",
+ ramdisk_module: "microdroid_ramdisk-5.10",
kernel_prebuilt: "empty_kernel",
header_version: "4",
partition_name: "init_boot",
@@ -281,7 +281,7 @@
}
android_filesystem {
- name: "microdroid_ramdisk",
+ name: "microdroid_ramdisk-5.10",
deps: [
"init_first_stage",
],
@@ -299,8 +299,8 @@
}
bootimg {
- name: "microdroid_vendor_boot",
- ramdisk_module: "microdroid_vendor_ramdisk",
+ name: "microdroid_vendor_boot-5.10",
+ ramdisk_module: "microdroid_vendor_ramdisk-5.10",
dtb_prebuilt: "dummy_dtb.img",
header_version: "4",
vendor_boot: true,
@@ -321,17 +321,17 @@
name: "microdroid_kernel_modules",
arch: {
arm64: {
- srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.15-arm64"],
+ srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.10-arm64"],
},
x86_64: {
- srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.15-x86_64"],
+ srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.10-x86_64"],
},
},
- kernel_version: "5.15",
+ kernel_version: "5.10",
}
android_filesystem {
- name: "microdroid_vendor_ramdisk",
+ name: "microdroid_vendor_ramdisk-5.10",
deps: [
"microdroid_fstab",
"microdroid_kernel_modules",
@@ -600,9 +600,9 @@
private_key: ":microdroid_sign_key",
partitions: [
"microdroid_vendor",
- "microdroid_vendor_boot",
+ "microdroid_vendor_boot-5.10",
"microdroid",
- "microdroid_boot",
+ "microdroid_boot-5.10",
"microdroid_init_boot",
],
}
diff --git a/microdroid/microdroid.json b/microdroid/microdroid.json
index bf8d93e..aff0b7b 100644
--- a/microdroid/microdroid.json
+++ b/microdroid/microdroid.json
@@ -5,7 +5,7 @@
"partitions": [
{
"label": "boot_a",
- "path": "/apex/com.android.virt/etc/fs/microdroid_boot.img"
+ "path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
{
"label": "init_boot_a",
@@ -13,7 +13,7 @@
},
{
"label": "vendor_boot_a",
- "path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot.img"
+ "path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot-5.10.img"
},
{
"label": "vbmeta_a",
diff --git a/tests/Android.bp b/tests/Android.bp
index a06a33a..2c36a62 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -16,7 +16,7 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-kernel_version = "5.15"
+kernel_version = "5.10"
kernel_stem = "kernel_prebuilts-" + kernel_version