bulid.config.msm.gki: Strict KMI enforcement when not doing mixed build

Enable strict KMI enforcement when not doing mixed build. This will
cause build_abi.sh to catch errors that would normally be masked beause
strict KMI was not enabled. These options are mutually exclusive with
mixed build, so should only be enabled when GKI_BUILD_CONFIG isn't set.

Change-Id: I7239f3c095d61dbdb4dfb904b30335ee06018341
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
This commit is contained in:
Elliot Berman 2021-06-02 12:44:43 -07:00 committed by Gerrit - the friendly Code Review server
parent ba9427c162
commit 0617661bb9
2 changed files with 14 additions and 1 deletions

View File

@ -2054,6 +2054,7 @@
sched_setscheduler
sched_setscheduler_nocheck
sched_show_task
sched_trace_rd_span
sched_uclamp_used
schedule
schedule_hrtimeout
@ -2506,6 +2507,7 @@
__traceiter_rwmmio_post_read
__traceiter_rwmmio_read
__traceiter_rwmmio_write
__traceiter_sched_overutilized_tp
__traceiter_sched_switch
__traceiter_suspend_resume
__tracepoint_android_rvh_account_irq
@ -2607,6 +2609,7 @@
__tracepoint_rwmmio_post_read
__tracepoint_rwmmio_read
__tracepoint_rwmmio_write
__tracepoint_sched_overutilized_tp
__tracepoint_sched_switch
__tracepoint_suspend_resume
trace_print_array_seq

View File

@ -24,7 +24,17 @@ GKI_SKIP_IF_VERSION_MATCHES=1
GKI_SKIP_CP_KERNEL_HDR=1
function sanity_check_abi() {
[ -z "${GKI_BUILD_CONFIG}" ] && return
if [ -z "${GKI_BUILD_CONFIG}" ] ; then
# When running build_abi.sh, mixed build is explicitly disabled
# In that case, turn on some options for trimming and strict mode
# which would normally be disabled because they conflict with
# mixed build
if [ "${VARIANT}" = gki ]; then
TRIM_NONLISTED_KMI=1
KMI_SYMBOL_LIST_STRICT_MODE=1
fi
return
fi
if ! diff -q "${ROOT_DIR}/${KERNEL_DIR}/android/abi_gki_aarch64.xml" \
"${ROOT_DIR}/${GKI_KERNEL_DIR}/android/abi_gki_aarch64.xml" ; then