Merge "Use ext4 for android_gsi image" into main am: d4ba673037
Original change: https://android-review.googlesource.com/c/platform/build/+/3364086
Change-Id: Icee9fdccc4b440e7f053c680a6c03d452a4f8ab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 69cf63a..ce93c94 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -346,11 +346,6 @@
],
}
-filegroup {
- name: "system_image_erofs_compress_hints.txt",
- srcs: ["erofs_compress_hints.txt"],
-}
-
android_filesystem_defaults {
name: "system_image_defaults",
partition_name: "system",
@@ -374,11 +369,6 @@
],
libs: [":framework-res{.export-package.apk}"],
},
- type: "erofs",
- erofs: {
- compressor: "lz4hc,9",
- compress_hints: ":system_image_erofs_compress_hints.txt",
- },
build_logtags: true,
gen_aconfig_flags_pb: true,
@@ -905,4 +895,9 @@
defaults: ["system_image_defaults"],
dirs: android_rootdirs,
symlinks: android_symlinks,
+ type: "erofs",
+ erofs: {
+ compressor: "lz4hc,9",
+ compress_hints: "erofs_compress_hints.txt",
+ },
}
diff --git a/target/product/gsi/Android.bp b/target/product/gsi/Android.bp
index 1b8f2d7..1d4fc42 100644
--- a/target/product/gsi/Android.bp
+++ b/target/product/gsi/Android.bp
@@ -196,4 +196,5 @@
"true": true,
default: false,
}),
+ type: "ext4",
}