commit a6a746ad2d719eb4cf56a34c0676c261ef752c0b
author Paul Westbrook <pwestbro@google.com> Wed Jun 27 14:29:58 2012 -0700
committer Paul Westbrook <pwestbro@google.com> Wed Jun 27 14:29:58 2012 -0700
tree 499ae6abd98ee550b61101166a7551e0ae908549
parent 8a7174467790a1732e6172841ec501f877669971

Build the right tests

Change-Id: I8a8f77b13961a3495cf97280e46e4f0449389b12

exchange2/Android.mk

diff --git a/exchange2/Android.mk b/exchange2/Android.mk
index 4bb191f..6d2b354 100644
--- a/exchange2/Android.mk
+++ b/exchange2/Android.mk
@@ -36,4 +36,4 @@
 include $(BUILD_PACKAGE)
 
 # additionally, build unit tests in a separate .apk
- include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under,$(LOCAL_PATH))

exchange2/tests/Android.mk

diff --git a/exchange2/tests/Android.mk b/exchange2/tests/Android.mk
index 0f36cd2..6055226 100644
--- a/exchange2/tests/Android.mk
+++ b/exchange2/tests/Android.mk
@@ -18,7 +18,8 @@
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+#LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_SDK_VERSION := current
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index c2f980e..10d8c87 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -31,6 +31,6 @@
 
 LOCAL_PACKAGE_NAME := ExchangeTests
 
-LOCAL_INSTRUMENTATION_FOR := Exchange2
+LOCAL_INSTRUMENTATION_FOR := Exchange
 
 include $(BUILD_PACKAGE)