Merge "Tag "tests" alone doesn\'t prevent including emma.jar" am: a23a97e3bf
am: 7c09c937b6
am: 1704a32d40
* commit '1704a32d40d181a659a25e2c69e51ef9b719f818':
Tag "tests" alone doesn't prevent including emma.jar
This commit is contained in:
commit
3799a8a534
1 changed files with 1 additions and 1 deletions
|
@ -176,7 +176,7 @@ endif # LOCAL_JACK_ENABLED
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue