commit cc600d6d47572a338ec9836b9e8232172f065ae1
author Paul Duffin <paulduffin@google.com> Mon Dec 11 15:13:08 2017 +0000
committer Paul Duffin <paulduffin@google.com> Tue Jan 30 12:39:09 2018 +0000
tree 244695b8f2a0817f8d03f1fa78d958a22f9fe1eb
parent d00221cfc681539bc0b0d5a1876bf58069e458f4

Build test-runner/tests

Previous change e254526f0fe5d22681555bd4a00b7ee96fee1dc1 inadvertently
removed the line to include the tests/Android.mk file.

(cherry picked from commit 006b7a2b760b89211b9530804118a8333cee314b)

Bug: 30188076
Test: make checkbuild
Change-Id: I59bd6ec5d317eb6306642974902e4c061e594aa8
Merged-In: Ia0ba14a70d2232d464420265a7a5f9c4dde3661b

test-runner/Android.mk

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 67f1354..706f636 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -116,3 +116,6 @@
 	$(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))