summaryrefslogtreecommitdiff
path: root/wrappers/java-android
diff options
context:
space:
mode:
Diffstat (limited to 'wrappers/java-android')
-rw-r--r--wrappers/java-android/Makefile6
-rw-r--r--wrappers/java-android/README.md4
2 files changed, 7 insertions, 3 deletions
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/*
diff --git a/wrappers/java-android/README.md b/wrappers/java-android/README.md
index 50e56fb..fe2660e 100644
--- a/wrappers/java-android/README.md
+++ b/wrappers/java-android/README.md
@@ -72,8 +72,8 @@ Run both unit tests and Android instrumented tests on a new emulator:
make test
```
-For all commands you can specify options to pass to Gradle via `GRADLE_FLAGS=`. Specify `NO_DAEMON=1` to
-add `--no-daemon`.
+For all commands you can specify options to pass to Gradle via `GRADLE_FLAGS=`, e.g. `GRADLE_FLAGS=--info`.
+Specify `NO_DAEMON=1` to add `--no-daemon`.
## Notes