Merge "resolved conflicts for merge of d78f338e to master"
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user