| commit | 2f7659c426de53122ee7922b0981058a900124a7 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Jun 19 01:59:05 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jun 19 00:18:04 2014 +0000 |
| tree | 80fce345a9f97378cae616854a48061e220b5502 | |
| parent | 272a7a31c814dbd3e372ae124e0cb6d0b034fdc0 [diff] | |
| parent | 4cdf1c4e7007afbe89f61dd9cb7b0980d55480a5 [diff] |
Merge "Switch from core to core-libart"
diff --git a/Android.mk b/Android.mk index 56cb2a9..3320266 100644 --- a/Android.mk +++ b/Android.mk
@@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(mockwebserver_src_files) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := mockwebserver -LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_LIBRARIES := core-libart LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY)