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

Commit 1acd7b04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Normalize target path for license dependencies."

parents ebb4bfe9 54b325df

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ endef 
###########################################################

define declare-license-deps

$(strip \

  $(eval _tgt := $(strip $(1))) \

  $(eval _tgt := $(subst //,/,$(strip $(1)))) \

  $(eval ALL_NON_MODULES += $(_tgt)) \

  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir,$(1))/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \

  $(eval ALL_NON_MODULES.$(_tgt).DEPENDENCIES := $(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES) $(2))) \
@@ -914,7 +914,7 @@ endef 
###########################################################

define declare-container-license-deps

$(strip \

  $(eval _tgt := $(strip $(1))) \

  $(eval _tgt := $(subst //,/,$(strip $(1)))) \

  $(eval ALL_NON_MODULES += $(_tgt)) \

  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir,$(1))/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \

  $(eval ALL_NON_MODULES.$(_tgt).DEPENDENCIES := $(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES) $(2))) \