StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tag "tests" alone doesn\'t prevent including emma.jar" am: a23a97e3bf

Browse Source 
am: 7c09c937b6

* commit '7c09c937b6e5e747d31e5ba308e6b3939cfdd83e':
  Tag "tests" alone doesn't prevent including emma.jar
This commit is contained in:
Ying Wang
2015-11-06 19:32:48 +00:00
committed by android-build-merger
parent 60bc4bf8fc 7c09c937b6
commit 1704a32d40
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/package_internal.mk
View File

@@ -176,7 +176,7 @@ endif # LOCAL_JACK_ENABLED
ifeq (true,$(EMMA_INSTRUMENT)) ifeq (true,$(EMMA_INSTRUMENT))
ifndef LOCAL_EMMA_INSTRUMENT ifndef LOCAL_EMMA_INSTRUMENT
# No emma for test apks. # No emma for test apks.
ifeq (,$(filer tests,$(LOCAL_MODULE_TAGS))$(LOCAL_INSTRUMENTATION_FOR)) ifeq (,$(LOCAL_INSTRUMENTATION_FOR))
LOCAL_EMMA_INSTRUMENT := true LOCAL_EMMA_INSTRUMENT := true
endif # No test apk endif # No test apk
endif # LOCAL_EMMA_INSTRUMENT is not set endif # LOCAL_EMMA_INSTRUMENT is not set