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

Commit 8e4024c8 authored by Cole Faust's avatar Cole Faust
Browse files

Rename some variables in definitions.mk 

Sublime text has an issue with their syntax highlighting, where it
looks for \s*define\b to indicate the start of a define block.
We had some variables that started with "define-", which match this
regex, which causes Sublime to be confused about where the defines
start and end. Rename the variables to work around this issue.

Test: m nothing
Change-Id: I997929606e2b0a8b086ad3b67a7ce1b5e99a7385
parent 23a778b3

core/definitions.mk

+9 −9
Original line number Diff line number Diff line
@@ -1547,10 +1547,10 @@ endef 
#

# You must call this with $(eval).

define define-aidl-java-rule

define-aidl-java-rule-src := $(patsubst %.aidl,%.java,$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define-aidl-java-rule-src) : $(call clean-path,$(LOCAL_PATH)/$(1)) $(AIDL)

define_aidl_java_rule_src := $(patsubst %.aidl,%.java,$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define_aidl_java_rule_src) : $(call clean-path,$(LOCAL_PATH)/$(1)) $(AIDL)

	$$(transform-aidl-to-java)

$(3) += $$(define-aidl-java-rule-src)

$(3) += $$(define_aidl_java_rule_src)

endef



## Given a .aidl file path generate the rule to compile it a .cpp file.
@@ -1560,10 +1560,10 @@ endef 
#

# You must call this with $(eval).

define define-aidl-cpp-rule

define-aidl-cpp-rule-src := $(patsubst %.aidl,%$(LOCAL_CPP_EXTENSION),$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define-aidl-cpp-rule-src) : $(call clean-path,$(LOCAL_PATH)/$(1)) $(AIDL_CPP)

define_aidl_cpp_rule_src := $(patsubst %.aidl,%$(LOCAL_CPP_EXTENSION),$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define_aidl_cpp_rule_src) : $(call clean-path,$(LOCAL_PATH)/$(1)) $(AIDL_CPP)

	$$(transform-aidl-to-cpp)

$(3) += $$(define-aidl-cpp-rule-src)

$(3) += $$(define_aidl_cpp_rule_src)

endef



###########################################################
@@ -1585,10 +1585,10 @@ endef 
#

# You must call this with $(eval).

define define-vts-cpp-rule

define-vts-cpp-rule-src := $(patsubst %.vts,%$(LOCAL_CPP_EXTENSION),$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define-vts-cpp-rule-src) : $(LOCAL_PATH)/$(1) $(VTSC)

define_vts_cpp_rule_src := $(patsubst %.vts,%$(LOCAL_CPP_EXTENSION),$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define_vts_cpp_rule_src) : $(LOCAL_PATH)/$(1) $(VTSC)

	$$(transform-vts-to-cpp)

$(3) += $$(define-vts-cpp-rule-src)

$(3) += $$(define_vts_cpp_rule_src)

endef



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