p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove '=' from the valid module/stem names 

Kati produces errors when a variable containing '=' is used as a
dependency:

https://github.com/google/kati/issues/138

So provide a better error message instead.

Test: Add a module with an '=', see new error
Change-Id: I09d570a8d19abb067621af9983a9d568b643dfb0
This commit is contained in:
Dan Willemsen 2018-07-16 13:57:52 -07:00
parent 25e4495de1
commit f012af1aab
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/definitions.mk
View File

@ -3552,10 +3552,12 @@ upper :=
########################################################### ###########################################################
## Verify module name meets character requirements: ## Verify module name meets character requirements:
## a-z A-Z 0-9 ## a-z A-Z 0-9
## _.+-=,@~ ## _.+-,@~
## ##
## This is a subset of bazel's target name restrictions: ## This is a subset of bazel's target name restrictions:
## https://docs.bazel.build/versions/master/build-ref.html#name ## https://docs.bazel.build/versions/master/build-ref.html#name
##
## Kati has problems with '=': https://github.com/google/kati/issues/138
########################################################### ###########################################################
define verify-module-name define verify-module-name
$(if $(filter-out $(LOCAL_MODULE),$(subst /,,$(LOCAL_MODULE))), \ $(if $(filter-out $(LOCAL_MODULE),$(subst /,,$(LOCAL_MODULE))), \
@ -3564,14 +3566,14 @@ $(if $(call _invalid-name-chars,$(LOCAL_MODULE)), \
$(call pretty-error,Invalid characters in module name: $(call _invalid-name-chars,$(LOCAL_MODULE)))) $(call pretty-error,Invalid characters in module name: $(call _invalid-name-chars,$(LOCAL_MODULE))))
endef endef
define _invalid-name-chars define _invalid-name-chars
$(subst _,,$(subst .,,$(subst +,,$(subst -,,$(subst =,,$(subst $(comma),,$(subst @,,$(subst ~,,$(subst 0,,$(subst 1,,$(subst 2,,$(subst 3,,$(subst 4,,$(subst 5,,$(subst 6,,$(subst 7,,$(subst 8,,$(subst 9,,$(subst a,,$(subst b,,$(subst c,,$(subst d,,$(subst e,,$(subst f,,$(subst g,,$(subst h,,$(subst i,,$(subst j,,$(subst k,,$(subst l,,$(subst m,,$(subst n,,$(subst o,,$(subst p,,$(subst q,,$(subst r,,$(subst s,,$(subst t,,$(subst u,,$(subst v,,$(subst w,,$(subst x,,$(subst y,,$(subst z,,$(call to-lower,$(1)))))))))))))))))))))))))))))))))))))))))))))) $(subst _,,$(subst .,,$(subst +,,$(subst -,,$(subst $(comma),,$(subst @,,$(subst ~,,$(subst 0,,$(subst 1,,$(subst 2,,$(subst 3,,$(subst 4,,$(subst 5,,$(subst 6,,$(subst 7,,$(subst 8,,$(subst 9,,$(subst a,,$(subst b,,$(subst c,,$(subst d,,$(subst e,,$(subst f,,$(subst g,,$(subst h,,$(subst i,,$(subst j,,$(subst k,,$(subst l,,$(subst m,,$(subst n,,$(subst o,,$(subst p,,$(subst q,,$(subst r,,$(subst s,,$(subst t,,$(subst u,,$(subst v,,$(subst w,,$(subst x,,$(subst y,,$(subst z,,$(call to-lower,$(1)))))))))))))))))))))))))))))))))))))))))))))
endef endef
.KATI_READONLY := verify-module-name _invalid-name-chars .KATI_READONLY := verify-module-name _invalid-name-chars
########################################################### ###########################################################
## Verify module stem meets character requirements: ## Verify module stem meets character requirements:
## a-z A-Z 0-9 ## a-z A-Z 0-9
## _.+-=,@~ ## _.+-,@~
## ##
## This is a subset of bazel's target name restrictions: ## This is a subset of bazel's target name restrictions:
## https://docs.bazel.build/versions/master/build-ref.html#name ## https://docs.bazel.build/versions/master/build-ref.html#name