diff options
| author | Jiyong Park <jiyong@google.com> | 2018-02-14 10:52:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-14 10:52:47 +0000 |
| commit | fa514a8f3d1258e6940e8f2c7550cd2dc5a19939 (patch) | |
| tree | 3755b673d1659b5a65d217ceabe138fd1a7b8dcb | |
| parent | 2440623105409d48ec0a3717bb6f3da711a0f15d (diff) | |
| parent | 3a51223f1734b082fc05ef447d780b6fb4c283ff (diff) | |
| download | mockwebserver-fa514a8f3d1258e6940e8f2c7550cd2dc5a19939.tar.gz | |
Merge "Build mockwebserver with core_current" am: 137de20af4
am: 3a51223f17
Change-Id: Id3ecb075c8076933edd5bd4222f6a501ef113047
| -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) |