From d439d1e72cf4a90b26c58dd26fd274a71563c3b8 Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Wed, 9 Feb 2022 12:51:44 +0100
Subject: Android wrapper fixes, disable Android instrumented tests on GitHub

---
 wrappers/java-android/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'wrappers/java-android/Makefile')

diff --git a/wrappers/java-android/Makefile b/wrappers/java-android/Makefile
index d249a50..1082aed 100644
--- a/wrappers/java-android/Makefile
+++ b/wrappers/java-android/Makefile
@@ -1,4 +1,4 @@
-.PHONY: build test android-test clean
+.PHONY: build android-test connected-android-test test clean
 
 EXPORTS_PATH ?= ../../exports
 include $(EXPORTS_PATH)/common.mk
@@ -22,7 +22,11 @@ connected-android-test:
 	./gradlew $(GRADLE_FLAGS) connectedAndroidTest
 
 test: .try-build-lib
+ifeq ($(NO_EMULATOR),1)
+	./gradlew $(GRADLE_FLAGS) test
+else
 	./gradlew $(GRADLE_FLAGS) test pixel2DebugAndroidTest
+endif
 
 clean:
 	rm -rf lib/build lib/.cxx lib/CMakeFiles lib/src/test/resources/*
-- 
cgit v1.2.3