aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Homescu <ahomescu@google.com>2024-02-28 22:49:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-28 22:49:56 +0000
commitef115fa88131e80c1cfb1f8057ec8b0710a521fa (patch)
tree42381a8edf1eb0cec9ba148bd96ef36cc5493986
parenta69395bdd2282964a4ad8b5c8abaf7b9d395ddca (diff)
parent2f27f04612b0e4e18e0d5d4a549f458198f57486 (diff)
downloadcommon-ef115fa88131e80c1cfb1f8057ec8b0710a521fa.tar.gz
make: Substitute build root with placeholder in defines am: 2f27f04612
Original change: https://android-review.googlesource.com/c/trusty/lk/common/+/2978633 Change-Id: I4b54f3576ff5f49de4d42384bc6b8ca2da504d7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--make/module.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/make/module.mk b/make/module.mk
index b270314a..7630c54a 100644
--- a/make/module.mk
+++ b/make/module.mk
@@ -73,7 +73,7 @@ MODULES += $(MODULE_DEPS)
# Turn spaces into underscores and escape quotes for the module_config.h header
define clean_defines
-$(subst $(SPACE),_,$(subst \",\\\\\",$(1)))
+$(subst $(SPACE),_,$(subst \",\\\\\",$(subst $(BUILDROOT),__BUILDROOT__,$(1))))
endef
MODULE_DEFINES += MODULE_COMPILEFLAGS=\"$(call clean_defines,$(MODULE_COMPILEFLAGS))\"