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

Commit 98a6abf7 authored by Jesse Wilson's avatar Jesse Wilson
Browse files

resolved conflicts for merge of d78f338e to master 

Change-Id: Ibe4be94126df9f1ea999b0396351886161552960
parents f8438a7d d78f338e

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ LOCAL_SRC_FILES := $(ext_src_files) 
LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core

LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := ext



LOCAL_NO_EMMA_INSTRUMENT := true