ANDROID: kleaf: Do not include GKI modules in default output of //common:kernel_aarch64.

When a device kernel builds their own modules that
conflicts with the GKI modules (zram and zsmalloc
for android13-5.15), the dist target will produce a
warning about conflicting source files.

Hence, do not include zram and zsmalloc to the device
dist targets by default when they include //common:kernel_aarch64
only.

If they wish to include zram and zsmalloc in
the distribution on the android13-5.15 branch,
they may add the following to the
dist target:

  "//common:kernel_aarch64_modules",

or individual modules:

  "//common:kernel_aarch64/drivers/block/zram/zram.ko",
  "//common:kernel_aarch64/mm/zsmalloc.ko",

//common:kernel_aarch64_dist continues to include GKI
modules defined by the branch.

Bug: 244215515
Test: manual
Change-Id: Iae701d7d452e6ed3a849fdfd03550551ca2af17e
Signed-off-by: Yifan Hong <elsk@google.com>
This commit is contained in:
Yifan Hong
2022-08-31 22:11:53 -07:00
parent bac79d727a
commit b4201bbc98

View File

@@ -29,7 +29,7 @@ define_common_kernels(target_configs = {
# TODO(b/188620248): re-enable trimming
"trim_nonlisted_kmi": False,
"kmi_symbol_list_strict_mode": False,
"module_outs": [
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
],
@@ -38,7 +38,7 @@ define_common_kernels(target_configs = {
# TODO(b/188620248): re-enable trimming
"trim_nonlisted_kmi": False,
"kmi_symbol_list_strict_mode": False,
"module_outs": [
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
],