diff options
| author | Ying Wang <wangying@google.com> | 2015-11-23 16:36:28 -0800 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-12-22 14:06:43 +0000 |
| commit | 04b2952d1e7276a2e53bfb1433bdda8a8523f910 (patch) | |
| tree | f6e5645291977181afd6f9b9ba9a947fe8b89f30 | |
| parent | 71a49ecfabfc192b2bc962be777d46bc7f3ab11b (diff) | |
| download | okhttp-04b2952d1e7276a2e53bfb1433bdda8a8523f910.tar.gz | |
Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit ab302b763d348bdd0e09b0a5899734abcdd8a97c)
Change-Id: I9b07b05c4dd3da46e4555953b20a07d8c8342045
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -58,7 +58,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := okhttp-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JAVA_LIBRARIES := core-libart conscrypt +LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) @@ -67,7 +67,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := okhttp-tests-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_test_src_files) -LOCAL_JAVA_LIBRARIES := core-libart okhttp-nojarjar junit4-target bouncycastle-nojarjar conscrypt +LOCAL_JAVA_LIBRARIES := core-oj core-libart okhttp-nojarjar junit4-target bouncycastle-nojarjar conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |