diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-19 15:11:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-19 15:11:16 +0000 |
| commit | 5ea6d395c59627f6d1c2aa091e77f9cd83d4e886 (patch) | |
| tree | 3755b673d1659b5a65d217ceabe138fd1a7b8dcb | |
| parent | 7c05da77a1780c14304430c19fb3d322c6b5d110 (diff) | |
| parent | 321c575bb9505c3c006b73ac646eeec32513e6cd (diff) | |
| download | mockwebserver-5ea6d395c59627f6d1c2aa091e77f9cd83d4e886.tar.gz | |
Merge "Reland "Build mockwebserver with core_current""android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -21,8 +21,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(mockwebserver_src_files) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := mockwebserver -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_NO_STANDARD_LIBRARIES := true +# Some tests (CtsVerifier, etc) that are built with SDK are using this library, +# thus this lib should be built with public APIs. Since this lib is not specific +# to Android, core_current which is a core-Java subset of Android SDK is used. +LOCAL_SDK_VERSION := core_current LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |