Retry test-runner tests move.
This time change the frameworks makefile so it only includes test-runner/src
in the public API.
diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 42167c7..962e96c 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -18,10 +18,13 @@
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := core framework
LOCAL_MODULE:= android.test.runner
include $(BUILD_JAVA_LIBRARY)
+
+# additionally, build unit tests in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))