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

Commit 4967b34d authored by Anton Hansson's avatar Anton Hansson
Browse files

Move a few more string functions to strings.mk 

So they can be used in product.mk

Bug: 80410283
Test: make
Change-Id: Ic94754f6b48a3281ca1dd8c195a3410b543eb366
parent ec382da3

core/definitions.mk

+0 −73
Original line number Original line Diff line number Diff line
@@ -739,79 +739,6 @@ define exported-sdk-libs-files 
$(foreach lib,$(1),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/exported-sdk-libs)

$(foreach lib,$(1),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/exported-sdk-libs)

endef

endef





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

## Returns true if $(1) and $(2) are equal.  Returns

## the empty string if they are not equal.

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

define streq

$(strip $(if $(strip $(1)),\

  $(if $(strip $(2)),\

    $(if $(filter-out __,_$(subst $(strip $(1)),,$(strip $(2)))$(subst $(strip $(2)),,$(strip $(1)))_),,true), \

    ),\

  $(if $(strip $(2)),\

    ,\

    true)\

 ))

endef



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

## Convert "a b c" into "a:b:c"

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

define normalize-path-list

$(subst $(space),:,$(strip $(1)))

endef



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

## Convert "a b c" into "a,b,c"

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

define normalize-comma-list

$(subst $(space),$(comma),$(strip $(1)))

endef



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

## Read the word out of a colon-separated list of words.

## This has the same behavior as the built-in function

## $(word n,str).

##

## The individual words may not contain spaces.

##

## $(1): 1 based index

## $(2): value of the form a:b:c...

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



define word-colon

$(word $(1),$(subst :,$(space),$(2)))

endef



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

## Convert "a=b c= d e = f" into "a=b c=d e=f"

##

## $(1): list to collapse

## $(2): if set, separator word; usually "=", ":", or ":="

##       Defaults to "=" if not set.

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



define collapse-pairs

$(eval _cpSEP := $(strip $(if $(2),$(2),=)))\

$(strip $(subst $(space)$(_cpSEP)$(space),$(_cpSEP),$(strip \

    $(subst $(_cpSEP), $(_cpSEP) ,$(1)))$(space)))

endef



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

## Given a list of pairs, if multiple pairs have the same

## first components, keep only the first pair.

##

## $(1): list of pairs

## $(2): the separator word, such as ":", "=", etc.

define uniq-pairs-by-first-component

$(eval _upbfc_fc_set :=)\

$(strip $(foreach w,$(1), $(eval _first := $(word 1,$(subst $(2),$(space),$(w))))\

    $(if $(filter $(_upbfc_fc_set),$(_first)),,$(w)\

        $(eval _upbfc_fc_set += $(_first)))))\

$(eval _upbfc_fc_set :=)\

$(eval _first:=)

endef



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

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

## MODULE_TAG set operations

## MODULE_TAG set operations

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

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

core/strings.mk

+73 −0
Original line number Original line Diff line number Diff line
@@ -42,3 +42,76 @@ endif 




lower :=

lower :=

upper :=

upper :=



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

## Returns true if $(1) and $(2) are equal.  Returns

## the empty string if they are not equal.

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

define streq

$(strip $(if $(strip $(1)),\

  $(if $(strip $(2)),\

    $(if $(filter-out __,_$(subst $(strip $(1)),,$(strip $(2)))$(subst $(strip $(2)),,$(strip $(1)))_),,true), \

    ),\

  $(if $(strip $(2)),\

    ,\

    true)\

 ))

endef



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

## Convert "a b c" into "a:b:c"

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

define normalize-path-list

$(subst $(space),:,$(strip $(1)))

endef



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

## Convert "a b c" into "a,b,c"

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

define normalize-comma-list

$(subst $(space),$(comma),$(strip $(1)))

endef



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

## Read the word out of a colon-separated list of words.

## This has the same behavior as the built-in function

## $(word n,str).

##

## The individual words may not contain spaces.

##

## $(1): 1 based index

## $(2): value of the form a:b:c...

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



define word-colon

$(word $(1),$(subst :,$(space),$(2)))

endef



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

## Convert "a=b c= d e = f" into "a=b c=d e=f"

##

## $(1): list to collapse

## $(2): if set, separator word; usually "=", ":", or ":="

##       Defaults to "=" if not set.

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



define collapse-pairs

$(eval _cpSEP := $(strip $(if $(2),$(2),=)))\

$(strip $(subst $(space)$(_cpSEP)$(space),$(_cpSEP),$(strip \

    $(subst $(_cpSEP), $(_cpSEP) ,$(1)))$(space)))

endef



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

## Given a list of pairs, if multiple pairs have the same

## first components, keep only the first pair.

##

## $(1): list of pairs

## $(2): the separator word, such as ":", "=", etc.

define uniq-pairs-by-first-component

$(eval _upbfc_fc_set :=)\

$(strip $(foreach w,$(1), $(eval _first := $(word 1,$(subst $(2),$(space),$(w))))\

    $(if $(filter $(_upbfc_fc_set),$(_first)),,$(w)\

        $(eval _upbfc_fc_set += $(_first)))))\

$(eval _upbfc_fc_set :=)\

$(eval _first:=)

endef