From 6de90d97a455a83a5854533317694ed327c2141f Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Fri, 3 Apr 2020 08:26:50 -0400 Subject: [PATCH] [build] Remove duplication of HANDY_TARGETS_EXTENSIONS --- build/platform.simulator.web.mak | 2 ++ build/targets.simulator.android.mak | 4 ---- build/targets.simulator.ios.mak | 4 ---- build/targets.simulator.mak | 2 -- build/targets.simulator.web.mak | 2 -- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build/platform.simulator.web.mak b/build/platform.simulator.web.mak index 0a39c53f8..aa105edbd 100644 --- a/build/platform.simulator.web.mak +++ b/build/platform.simulator.web.mak @@ -1,2 +1,4 @@ TOOLCHAIN = emscripten EXE = js + +HANDY_TARGETS_EXTENSIONS += zip diff --git a/build/targets.simulator.android.mak b/build/targets.simulator.android.mak index 1cd826d3c..18980fc33 100644 --- a/build/targets.simulator.android.mak +++ b/build/targets.simulator.android.mak @@ -1,7 +1,3 @@ -ifndef ARCH -HANDY_TARGETS_EXTENSIONS += apk -endif - .PHONY: %_run %_run: $(BUILD_DIR)/%.apk $(call rule_label,ADB) diff --git a/build/targets.simulator.ios.mak b/build/targets.simulator.ios.mak index c5f26ad8d..4986049d5 100644 --- a/build/targets.simulator.ios.mak +++ b/build/targets.simulator.ios.mak @@ -1,7 +1,3 @@ -ifndef ARCH -HANDY_TARGETS_EXTENSIONS += apk -endif - ifeq ($(APPLE_PLATFORM),ios-simulator) .PHONY: %_run %_run: $(BUILD_DIR)/%.app diff --git a/build/targets.simulator.mak b/build/targets.simulator.mak index 942822600..6e6ed0fe6 100644 --- a/build/targets.simulator.mak +++ b/build/targets.simulator.mak @@ -1,10 +1,8 @@ # Headless targets $(eval $(call rule_for_epsilon_flavor,headless)) - HANDY_TARGETS += epsilon.headless $(BUILD_DIR)/test.headless.$(EXE): $(call flavored_object_for,$(test_runner_src),headless) - HANDY_TARGETS += test.headless -include build/targets.simulator.$(TARGET).mak diff --git a/build/targets.simulator.web.mak b/build/targets.simulator.web.mak index e8ef36832..ead0b515e 100644 --- a/build/targets.simulator.web.mak +++ b/build/targets.simulator.web.mak @@ -1,3 +1 @@ -HANDY_TARGETS_EXTENSIONS += zip - $(BUILD_DIR)/test.headless.js: EMSCRIPTEN_MODULARIZE = 0