diff --git a/build/targets.simulator.android.mak b/build/targets.simulator.android.mak index e6f2d9dbc..1cd826d3c 100644 --- a/build/targets.simulator.android.mak +++ b/build/targets.simulator.android.mak @@ -1,3 +1,8 @@ ifndef ARCH HANDY_TARGETS_EXTENSIONS += apk endif + +.PHONY: %_run +%_run: $(BUILD_DIR)/%.apk + $(call rule_label,ADB) + $(Q) adb install $< diff --git a/build/targets.simulator.ios.mak b/build/targets.simulator.ios.mak new file mode 100644 index 000000000..c5f26ad8d --- /dev/null +++ b/build/targets.simulator.ios.mak @@ -0,0 +1,10 @@ +ifndef ARCH +HANDY_TARGETS_EXTENSIONS += apk +endif + +ifeq ($(APPLE_PLATFORM),ios-simulator) +.PHONY: %_run +%_run: $(BUILD_DIR)/%.app + $(call rule_label,XCRUN) + $(Q) xcrun simctl install booted $^ +endif diff --git a/ion/src/simulator/android/Makefile b/ion/src/simulator/android/Makefile index 0d0410e1e..a0417ebd9 100644 --- a/ion/src/simulator/android/Makefile +++ b/ion/src/simulator/android/Makefile @@ -71,15 +71,10 @@ apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/ .PRECIOUS: $(apk_deps) $(BUILD_DIR)/%.apk: $(apk_deps) - @echo "GRADLE ion/src/simulator/android/build.gradle" + $(call rule_label,GRADLE) $(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle assembleRelease $(Q) cp $(BUILD_DIR)/app/outputs/apk/release/android-release*.apk $@ DEFAULT = epsilon.apk -.PHONY: %_run -%_run: $(BUILD_DIR)/%.apk - @echo "ADB $*.apk" - $(Q) adb install $< - endif diff --git a/ion/src/simulator/ios/Makefile b/ion/src/simulator/ios/Makefile index d18e5d436..a9dca15e5 100644 --- a/ion/src/simulator/ios/Makefile +++ b/ion/src/simulator/ios/Makefile @@ -103,10 +103,4 @@ endif DEFAULT = epsilon.ipa -ifeq ($(APPLE_PLATFORM),ios-simulator) -.PHONY: %_run -%_run: $(BUILD_DIR)/%.app - xcrun simctl install booted $^ -endif - endif