commit bdae2b8e69cc9b9cca5544895faca18fae40a1c4
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 14 21:20:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 14 21:20:10 2022 +0000
tree 2ef80f6484a821750f776a81101d5f34884bd8e6
parent 019485a8577acd283b83dbdfd6634fcb297c4c0b
parent ba5d947d2387e55d63c21fc2cbd7c3753c725fd9

Merge "Normalize target path for license dependencies." am: 1acd7b0438 am: a21737a58f am: f1fd15f02c am: ba5d947d23

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

Change-Id: I4e3ccf46b30e1c8afae11dee3e1dc6729ffdb88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index aa53579..0385315 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -897,7 +897,7 @@
 ###########################################################
 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 @@
 ###########################################################
 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))) \