am e43b11ba: Handle correction of rejected Ping heartbeat
Merge commit 'e43b11ba3e9be9380b7c43cde3117c6de28f28bd' into gingerbread
* commit 'e43b11ba3e9be9380b7c43cde3117c6de28f28bd':
Handle correction of rejected Ping heartbeat
diff --git a/Android.mk b/Android.mk
index e7c3d42..4e8239b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,17 @@
LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+# The Emma tool analyzes code coverage when running unit tests on the
+# application. This configuration line selects which packages will be analyzed,
+# leaving out code which is tested by other means (e.g. static libraries) that
+# would dilute the coverage results. These options do not affect regular
+# production builds.
+LOCAL_EMMA_COVERAGE_FILTER := +com.android.email.*,+org.apache.james.mime4j.* \
+ +com.beetstra.jutf7.*,+org.apache.commons.io.*
+# EXCHANGE-REMOVE-SECTION-START
+LOCAL_EMMA_COVERAGE_FILTER += +com.android.exchange.*
+# EXCHANGE-REMOVE-SECTION-END
+
include $(BUILD_PACKAGE)
# additionally, build unit tests in a separate .apk
diff --git a/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java b/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
index 5180f10..372643a 100644
--- a/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
+++ b/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
@@ -15,7 +15,6 @@
package com.android.exchange.utility;
-import com.android.email.TestUtils;
import com.android.email.Utility;
import junit.framework.TestCase;
