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

Unverified Commit fa798218 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab
Browse files

Don't error on kernel headers in LOCAL_ADDITIONAL_DEPENDENCIES 

The new kernel header dependency path is wrongly picked up by this
logic. Check if KERNEL_OBJ is contained in the string and only error
if it isn't.

Change-Id: I5425f11eb8b650a80ce1dda303514fdc64888af9
parent eb25257e

core/base_rules.mk

+4 −0
Original line number Diff line number Diff line
@@ -111,10 +111,14 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(filter-out %.mk,$(LOCAL_ADDITIONAL_DEPENDENCI 


my_bad_deps := $(strip $(foreach dep,$(filter-out | ||,$(LOCAL_ADDITIONAL_DEPENDENCIES)),\

                 $(if $(findstring /,$(dep)),,$(dep))))

my_bad_deps_sans_kernel := $(strip $(foreach dep,$(filter-out | ||,$(my_bad_deps)),\

                 $(if $(findstring KERNEL_OBJ,$(dep)),,$(dep))))

ifeq ($(my_bad_deps_sans_kernel),)

ifneq ($(my_bad_deps),)

$(call pretty-warning,"Bad LOCAL_ADDITIONAL_DEPENDENCIES: $(my_bad_deps)")

$(call pretty-error,"LOCAL_ADDITIONAL_DEPENDENCIES must only contain paths (not module names)")

endif

endif



###########################################################

## Validate and define fallbacks for input LOCAL_* variables.