summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2012-10-24 12:26:57 -0700
committerChiao Cheng <chiaocheng@google.com>2012-10-24 16:25:52 -0700
commitb3ed20e0e1f6183489cb0939b1200010a2cbeb9a (patch)
tree0a3d56f13e2e7e2960ac9a4f42632c55a224a363 /tests
parent472010435fd9270f848de88facfe1741163126e0 (diff)
downloadandroid_packages_apps_ContactsCommon-b3ed20e0e1f6183489cb0939b1200010a2cbeb9a.tar.gz
android_packages_apps_ContactsCommon-b3ed20e0e1f6183489cb0939b1200010a2cbeb9a.tar.bz2
android_packages_apps_ContactsCommon-b3ed20e0e1f6183489cb0939b1200010a2cbeb9a.zip
Adding back build for Contacts common unit tests.
Had to fix contacts common AndroidManifest to include an empty application tag. Also disabling proguard since Contacts common is a library project and does not have any activities by itself. Bug: 6993891 Change-Id: I6b56ce54d48991c62c8c35e438474f7a5a074f86
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.mk16
-rw-r--r--tests/AndroidManifest.xml2
2 files changed, 17 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 00000000..8ecf594b
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# We only want this apk build for tests.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+# Include all test java files.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := com.android.contacts.common.unittest
+
+LOCAL_INSTRUMENTATION_FOR := com.android.contacts.common
+
+include $(BUILD_PACKAGE)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 9687a662..e181b2b9 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -23,7 +23,7 @@
</application>
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.contacts.common.unittest"
+ android:targetPackage="com.android.contacts.common"
android:label="Contacts common unit tests">
</instrumentation>