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

Commit aefec234 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix copy+paste error" am: 187a6be0 

Original change: https://android-review.googlesource.com/c/platform/build/+/2324116



Change-Id: I7c463efe1a7315147c54fbe92f36bf64c14d9007
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 577bd161 187a6be0

core/definitions.mk

+11 −9
Original line number Diff line number Diff line
@@ -595,12 +595,10 @@ endef 
## license metadata.

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

define declare-copy-target-license-metadata

$(strip $(if $(filter $(OUT_DIR)%,$(2)),$(eval _dir:=$(call license-metadata-dir,$(1)))\

$(strip $(if $(filter $(OUT_DIR)%,$(2)),\

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

  $(eval _meta := $(call append-path,$(_dir),$(patsubst $(OUT_DIR)%,out%,$(_tgt).meta_lic)))\

  $(eval ALL_COPIED_TARGETS.$(_tgt).SOURCES := $(ALL_COPIED_TARGETS.$(_tgt).SOURCES) $(filter $(OUT_DIR)%,$(2)))\

  $(eval ALL_COPIED_TARGETS += $(_tgt)),\

  $(eval ALL_TARGETS.$(1).META_LIC:=$(module_license_metadata))))

  $(eval ALL_COPIED_TARGETS += $(_tgt))))

endef



###########################################################
@@ -746,11 +744,10 @@ $(strip $(eval ALL_TARGETS.$(1).META_LIC:=$(_meta))) 
$(strip $(eval _dep:=))

$(strip $(foreach s,$(ALL_COPIED_TARGETS.$(1).SOURCES),\

  $(eval _dmeta:=$(ALL_TARGETS.$(s).META_LIC))\

  $(if $(filter 0p,$(_dmeta)),\

    $(if $(filter-out 0p,$(_dep)),,$(eval ALL_TARGETS.$(1).META_LIC:=0p)),\

    $(if $(_dep),\

      $(if $(filter-out $(_dep),$(_dmeta)),$(error cannot copy target from multiple modules: $(1) from $(_dep) and $(_dmeta))),

      $(eval _dep:=$(_dmeta))))))

  $(if $(filter-out 0p,$(_dep)),\

      $(if $(filter-out $(_dep),$(_dmeta)),$(error cannot copy target from multiple modules: $(1) from $(_dep) and $(_dmeta))),\

      $(eval _dep:=$(_dmeta)))))

$(if $(filter 0p,$(_dep)),$(eval ALL_TARGETS.$(1).META_LIC:=0p))

$(strip $(if $(strip $(_dep)),,$(error cannot copy target from unknown module: $(1) from $(ALL_COPIED_TARGETS.$(1).SOURCES))))



ifneq (0p,$(ALL_TARGETS.$(1).META_LIC))
@@ -772,6 +769,11 @@ $(_meta) : $(_dep) $(COPY_LICENSE_METADATA) 
	  -o $$@



endif



$(eval _dep:=)

$(eval _dmeta:=)

$(eval _meta:=)

$(eval _dir:=)

endef



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