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
diff --git a/Android.mk b/Android.mk
index 941d13e..9a5306f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,6 +28,7 @@
LOCAL_PACKAGE_NAME := com.android.contacts.common
+LOCAL_PROGUARD_ENABLED := disabled
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b745542..7ab7a75 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,4 +17,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts.common">
+ <application/>
</manifest>
diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 0000000..8ecf594
--- /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 9687a66..e181b2b 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>