build: support --use_prebuilt_gki [1/1]
PD#SWPL-130219
Problem:
support --use_prebuilt_gki
Solution:
support --use_prebuilt_gki
Verify:
local
Change-Id: I32515737f5663b798f23ee2c69ce4b766ee1c5e6
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
diff --git a/amlogic_utils.bzl b/amlogic_utils.bzl
index 224f0b3..6bb30f3 100644
--- a/amlogic_utils.bzl
+++ b/amlogic_utils.bzl
@@ -71,8 +71,6 @@
kmi_symbol_list_add_only: See [kernel_abi.kmi_symbol_list_add_only](#kernel_abi-kmi_symbol_list_add_only).
module_grouping: See [kernel_abi.module_grouping](#kernel_abi-module_grouping).
unstripped_modules_archive: See [kernel_abi.unstripped_modules_archive](#kernel_abi-unstripped_modules_archive).
- gki_modules_list: List of gki modules to be copied to the dist directory.
- If `None`, all gki kernel modules will be copied.
dist_dir: Argument to `copy_to_dist_dir`. If `None`, default is `"out/{BRANCH}/dist"`.
"""
@@ -85,9 +83,6 @@
if kmi_symbol_list_add_only == None:
kmi_symbol_list_add_only = True if define_abi_targets else None
- if gki_modules_list == None:
- gki_modules_list = [":kernel_aarch64_modules"]
-
if dist_dir == None:
dist_dir = "out/{branch}/dist".format(branch = BRANCH)
@@ -102,7 +97,7 @@
module_outs = module_outs,
build_config = build_config,
# Enable mixed build.
- base_kernel = ":kernel_aarch64",
+ base_kernel = ":kernel_aarch64_download_or_build",
kmi_symbol_list = kmi_symbol_list,
collect_unstripped_modules = _COLLECT_UNSTRIPPED_MODULES,
strip_modules = True,
@@ -149,14 +144,14 @@
name + "_images",
name + "_modules_install",
# Mixed build: Additional GKI artifacts.
- ":kernel_aarch64",
- ":kernel_aarch64_additional_artifacts",
+ ":kernel_aarch64_download_or_build",
+ ":kernel_aarch64_additional_artifacts_download_or_build",
name + "_merged_kernel_uapi_headers",
]
copy_to_dist_dir(
name = name + "_dist",
- data = dist_targets + gki_modules_list,
+ data = dist_targets,
dist_dir = dist_dir,
flat = True,
log = "info",