scripts: use additional_kmi_symbol_lists add symboi [1/1]
PD#SWPL-180503
Problem:
add symbol not modify android/abi_gki_aarch64_amlogic file
Solution:
use additional_kmi_symbol_lists add symbol
Verify:
local
Change-Id: I992ce14f3511e1203b32ac3c4ffa07be1a3009ed
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
diff --git a/amlogic.bzl b/amlogic.bzl
index 4ce434b..a8dd38f 100644
--- a/amlogic.bzl
+++ b/amlogic.bzl
@@ -3,7 +3,7 @@
load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels")
load("//common:common_drivers/amlogic_utils.bzl", "define_common_amlogic")
load("//common:common_drivers/modules.bzl", "AMLOGIC_MODULES")
-load("//common:common_drivers/project/project.bzl", "EXT_MODULES_ANDROID", "GKI_CONFIG", "KCONFIG_EXT_SRCS")
+load("//common:common_drivers/project/project.bzl", "EXT_MODULES_ANDROID", "GKI_CONFIG", "KCONFIG_EXT_SRCS", "FULL_KERNEL_VERSION")
load("//common:common_drivers/project/dtb.bzl", "AMLOGIC_DTBS")
_AMLOGIC_DTBOS = [
@@ -26,6 +26,7 @@
dtbo_srcs = _AMLOGIC_DTBOS,
define_abi_targets = True if GKI_CONFIG else False,
kmi_symbol_list = "//common:android/abi_gki_aarch64_amlogic" if GKI_CONFIG else None,
+ additional_kmi_symbol_lists = native.glob(["common_drivers/android/%s_abi_gki_aarch64_amlogic*" % FULL_KERNEL_VERSION]) if GKI_CONFIG else None,
kmi_symbol_list_add_only = True if GKI_CONFIG else False,
build_config = "common_drivers/build.config.amlogic.bazel",
module_outs = _AMLOGIC_MODULES,
diff --git a/amlogic_utils.bzl b/amlogic_utils.bzl
index 609ad4d..897a4c0 100644
--- a/amlogic_utils.bzl
+++ b/amlogic_utils.bzl
@@ -37,6 +37,7 @@
make_goals = None,
define_abi_targets = None,
kmi_symbol_list = None,
+ additional_kmi_symbol_lists = None,
kmi_symbol_list_add_only = None,
module_grouping = None,
unstripped_modules_archive = None,
@@ -92,6 +93,7 @@
# Enable mixed build.
base_kernel = ":kernel_aarch64" if FAST_BUILD else ":kernel_aarch64_download_or_build",
kmi_symbol_list = None if FAST_BUILD else kmi_symbol_list,
+ additional_kmi_symbol_lists = None if FAST_BUILD else additional_kmi_symbol_lists,
collect_unstripped_modules = _COLLECT_UNSTRIPPED_MODULES,
strip_modules = True,
make_goals = make_goals,
diff --git a/mk.sh b/mk.sh
index 916f4f6..0fde49f 100755
--- a/mk.sh
+++ b/mk.sh
@@ -110,7 +110,7 @@
build_part_of_kernel
if [[ "${FULL_KERNEL_VERSION}" != "common13-5.15" && "${ARCH}" = "arm64" && ${BAZEL} == 1 ]]; then
- args=$@
+ args="$@ --config=stamp"
if [[ -n ${FAST_BUILD} ]]; then
args="${args} --config=fast --lto=none"
else
@@ -121,14 +121,6 @@
PROJECT_DIR=${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/project
[[ -d ${PROJECT_DIR} ]] || mkdir -p ${PROJECT_DIR}
- pushd ${ROOT_DIR}/${KERNEL_DIR}
- git checkout android/abi_gki_aarch64_amlogic
- cat ${COMMON_DRIVERS_DIR}/android/${FULL_KERNEL_VERSION}_abi_gki_aarch64_amlogic >> android/abi_gki_aarch64_amlogic
- cat ${COMMON_DRIVERS_DIR}/android/${FULL_KERNEL_VERSION}_abi_gki_aarch64_amlogic.10 >> android/abi_gki_aarch64_amlogic
- cat ${COMMON_DRIVERS_DIR}/android/${FULL_KERNEL_VERSION}_abi_gki_aarch64_amlogic.debug >> android/abi_gki_aarch64_amlogic
- cat ${COMMON_DRIVERS_DIR}/android/${FULL_KERNEL_VERSION}_abi_gki_aarch64_amlogic.illegal >> android/abi_gki_aarch64_amlogic
- popd
-
if [[ ! -f ${PROJECT_DIR}/build.config.project ]]; then
touch ${PROJECT_DIR}/build.config.project
echo "# SPDX-License-Identifier: GPL-2.0" > ${PROJECT_DIR}/build.config.project
@@ -189,6 +181,10 @@
fi
echo >> ${PROJECT_DIR}/project.bzl
+ sed -i "/FULL_KERNEL_VERSION/d" ${PROJECT_DIR}/project.bzl
+ echo "FULL_KERNEL_VERSION = \"${FULL_KERNEL_VERSION}\"" >> ${PROJECT_DIR}/project.bzl
+
+ echo >> ${PROJECT_DIR}/project.bzl
sed -i "/ANDROID_PROJECT/d" ${PROJECT_DIR}/project.bzl
echo "ANDROID_PROJECT = \"${ANDROID_PROJECT}\"" >> ${PROJECT_DIR}/project.bzl