diff options
| author | Narayan Kamath <narayan@google.com> | 2015-12-24 12:04:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-24 12:04:56 +0000 |
| commit | beb9a51c4d6d935d540b5f69bda7acfb3d6f8812 (patch) | |
| tree | f6e5645291977181afd6f9b9ba9a947fe8b89f30 | |
| parent | d888fa3ed39ea21a29e80864a4e132f7ef63e221 (diff) | |
| parent | 27a7c9ada5f0ad33cb6474fa175cd89da85b37f1 (diff) | |
| download | okhttp-beb9a51c4d6d935d540b5f69bda7acfb3d6f8812.tar.gz | |
Merge changes from topic \'aosp-merge-24-12\'
am: 27a7c9ada5
* commit '27a7c9ada5f0ad33cb6474fa175cd89da85b37f1':
Use core-oj alongside core-libart wherever required.
Add core-oj to the list of dependencies
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -48,7 +48,7 @@ LOCAL_MODULE := okhttp LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_system_src_files) LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt -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_JAVA_LIBRARY) @@ -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) |