commit dfe5f234a205a76e8a3962a901d4193e222c3ab5
author Roshan Pius <rpius@google.com> Fri Sep 29 22:24:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 29 22:24:34 2017 +0000
tree 6e9ff97bf0f669a3d9a2131009954cad00bed015
parent 4158fa166d70176e8cf6cd58b3f09681fbb206c1
parent 9d7cf1434fc63dec2d63d5a9c7330c2fa37aefc5

Merge changes I38c31645,Ib6f61b81 into oc-mr1-dev
am: 9d7cf1434f

Change-Id: I79cdd12cae7ae31543f2c5b85598de0967ce4a47

service/Android.mk

diff --git a/service/Android.mk b/service/Android.mk
index e1bac28..5b539e5 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -74,11 +74,6 @@
 LOCAL_DEX_PREOPT_GENERATE_PROFILE := true
 LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := frameworks/base/services/art-profile
 
-ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
-LOCAL_EMMA_INSTRUMENT := true
-endif
-
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.server.wifi.*
 
 include $(BUILD_JAVA_LIBRARY)