Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 016586e6 authored by Quentin Perret's avatar Quentin Perret
Browse files

ANDROID: kbuild: align UNUSED_KSYMS_WHITELIST with upstream 



The UNUSED_KSYMS_WHITELIST feature as been merged in ACK as FROMLIST v5,
but the v6 got recently queued with minor changes.

Align the Android code with what will be merged upstream.

Bug: 148277666
Fixes: 3d0431a8 ("BACKPORT: FROMLIST: kbuild: allow symbol
whitelisting with TRIM_UNUSED_KSYMS")
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Change-Id: I41726e3fba6e299bb541f93ae9ac31add0c08b60
parent defbf3ac

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1105,8 +1105,8 @@ endif 
autoksyms_h := $(if $(CONFIG_TRIM_UNUSED_KSYMS), include/generated/autoksyms.h)



quiet_cmd_autoksyms_h = GEN     $@

      cmd_autoksyms_h = mkdir -p $(dir $@); $(CONFIG_SHELL) \

			$(srctree)/scripts/gen_autoksyms.sh $@

      cmd_autoksyms_h = mkdir -p $(dir $@); \

			$(CONFIG_SHELL) $(srctree)/scripts/gen_autoksyms.sh $@



$(autoksyms_h):

	$(call cmd,autoksyms_h)

scripts/gen_autoksyms.sh

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ if [ -n "$CONFIG_UNUSED_KSYMS_WHITELIST" ]; then 
	# Use 'eval' to expand the whitelist path and check if it is relative

	eval ksym_wl="$CONFIG_UNUSED_KSYMS_WHITELIST"

	[ "${ksym_wl}" != "${ksym_wl#/}" ] || ksym_wl="$abs_srctree/$ksym_wl"

	if [ ! -f "$ksym_wl" ]; then

	if [ ! -f "$ksym_wl" ] || [ ! -r "$ksym_wl" ]; then

		echo "ERROR: '$ksym_wl' whitelist file not found" >&2

		exit 1

	fi