Merge "Tag "tests" alone doesn\'t prevent including emma.jar" am: a23a97e3bf
am: 7c09c937b6
* commit '7c09c937b6e5e747d31e5ba308e6b3939cfdd83e':
Tag "tests" alone doesn't prevent including emma.jar
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user