| commit | e2487201d39af71608f73f5d90077b067bd7a8dd | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Tue Nov 24 01:13:01 2015 -0800 |
| committer | The Android Automerger <android-build@google.com> | Tue Nov 24 01:13:01 2015 -0800 |
| tree | 29bef7c7ee1b4f302dc86d26dabcf37776987c22 | |
| parent | 4a373829b099ba8aab9c4b88c25cd0391b5051dc [diff] | |
| parent | ecaaf427f219266a1b83694d17657bf1992af642 [diff] |
merge in nyc-release history after reset to master
diff --git a/Android.mk b/Android.mk index a48a904..3134ef5 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-libart +LOCAL_JAVA_LIBRARIES := core-oj core-libart LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY)