Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 864feb8d authored by Guang Zhu's avatar Guang Zhu
Browse files

disable emma instrumentation for framework, ext and services (DO NOT MERGE) 

When these libraries are instrumented with emma instructions, runtime keeps
restarting on native crashes. To acheive a fully emma instrumented build,
we need to disable emma instrumentation on these libraries.

Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
parent 4ec730ca

Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ LOCAL_JAVA_LIBRARIES := core ext 
LOCAL_MODULE := framework

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



LOCAL_NO_EMMA_INSTRUMENT := true

LOCAL_NO_EMMA_COMPILE := true



# List of classes and interfaces which should be loaded by the Zygote.

LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes
@@ -596,6 +599,9 @@ LOCAL_JAVA_LIBRARIES := core 


LOCAL_MODULE := ext



LOCAL_NO_EMMA_INSTRUMENT := true

LOCAL_NO_EMMA_COMPILE := true



include $(BUILD_JAVA_LIBRARY)

services/java/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ LOCAL_MODULE:= services 


LOCAL_JAVA_LIBRARIES := android.policy



LOCAL_NO_EMMA_INSTRUMENT := true

LOCAL_NO_EMMA_COMPILE := true



include $(BUILD_JAVA_LIBRARY)



include $(BUILD_DROIDDOC)