summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2017-12-11 15:13:08 +0000
committer Paul Duffin <paulduffin@google.com> 2017-12-11 21:39:23 +0000
commit006b7a2b760b89211b9530804118a8333cee314b (patch)
treeb2580cf79de575f66ad5235d1ee75180157cb69a
parent0b62766d27da6867cc6d00347cd81427a6ec9e86 (diff)
Build test-runner/tests
Previous change e254526f0fe5d22681555bd4a00b7ee96fee1dc1 inadvertently removed the line to include the tests/Android.mk file. Bug: 30188076 Test: make checkbuild Change-Id: Ia0ba14a70d2232d464420265a7a5f9c4dde3661b
-rw-r--r--test-runner/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 67f1354d52bc..706f6364ef8d 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -116,3 +116,6 @@ update-android-test-runner-api: $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) | $(ACP)
$(hide) $(ACP) $(ANDROID_TEST_RUNNER_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_RUNNER_REMOVED_API_FILE)
endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
+
+# additionally, build unit tests in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))