diff options
| author | 2018-02-09 18:20:23 +0000 | |
|---|---|---|
| committer | 2018-02-09 18:20:23 +0000 | |
| commit | 67a3d45c89c0e43f7206936a7438dfed79fea159 (patch) | |
| tree | 0dfdfcb352ce16cd2d24be00dd6b22e4cdd9b995 | |
| parent | dc46115ab283bac2453b4f9e454e66107e64e8ef (diff) | |
| parent | 3d08bbd60aa255af99e575579e8fa78d12d77871 (diff) | |
Merge "Use to-upper function instead of $(shell tr)"
| -rw-r--r-- | test/Android.run-test.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 2df0cc6fae..464449c752 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -32,11 +32,6 @@ TEST_ART_RUN_TEST_DEPENDENCIES += \ $(HOST_OUT_EXECUTABLES)/d8-compat-dx endif -# Convert's a rule name to the form used in variables, e.g. no-relocate to NO_RELOCATE -define name-to-var -$(shell echo $(1) | tr '[:lower:]' '[:upper:]' | tr '-' '_') -endef # name-to-var - # We need dex2oat and dalvikvm on the target as well as the core images (all images as we sync # only once). TEST_ART_TARGET_SYNC_DEPS += $(ART_TARGET_EXECUTABLES) $(TARGET_CORE_IMG_OUTS) @@ -124,13 +119,13 @@ define core-image-dependencies endif endif ifeq ($(2),no-image) - $(1)_prereq_rules += $$($(call name-to-var,$(1))_CORE_IMAGE_$$(image_suffix)_$(4)) + $(1)_prereq_rules += $$($(call to-upper,$(1))_CORE_IMAGE_$$(image_suffix)_$(4)) else ifeq ($(2),picimage) - $(1)_prereq_rules += $$($(call name-to-var,$(1))_CORE_IMAGE_$$(image_suffix)_$(4)) + $(1)_prereq_rules += $$($(call to-upper,$(1))_CORE_IMAGE_$$(image_suffix)_$(4)) else ifeq ($(2),multipicimage) - $(1)_prereq_rules += $$($(call name-to-var,$(1))_CORE_IMAGE_$$(image_suffix)_multi_$(4)) + $(1)_prereq_rules += $$($(call to-upper,$(1))_CORE_IMAGE_$$(image_suffix)_multi_$(4)) endif endif endif @@ -174,7 +169,6 @@ test-art-run-test : test-art-host-run-test test-art-target-run-test host_prereq_rules := target_prereq_rules := core-image-dependencies := -name-to-var := define-test-art-host-or-target-run-test-group := TARGET_TYPES := COMPILER_TYPES := |