commit a23a97e3bf77bdd7fa01cd1f681d758a943db63a
author Ying Wang <wangying@android.com> Fri Nov 06 19:27:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 06 19:27:52 2015 +0000
tree 188ada47c84ea7ea2a016d0ecabd98003d304a70
parent 53a6fd649817e5d9909d9aaca0369c19840f8613
parent 324ffb27852e853919452890c200f1af8c8b6f49

Merge "Tag "tests" alone doesn't prevent including emma.jar"

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index a2cbe31..cb77e76 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -176,7 +176,7 @@
 ifeq (true,$(EMMA_INSTRUMENT))
 ifndef LOCAL_EMMA_INSTRUMENT
 # No emma for test apks.
-ifeq (,$(filer tests,$(LOCAL_MODULE_TAGS))$(LOCAL_INSTRUMENTATION_FOR))
+ifeq (,$(LOCAL_INSTRUMENTATION_FOR))
 LOCAL_EMMA_INSTRUMENT := true
 endif # No test apk
 endif # LOCAL_EMMA_INSTRUMENT is not set