diff options
| author | Jiyong Park <jiyong@google.com> | 2018-02-19 15:25:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-19 15:25:37 +0000 |
| commit | 67bf89d8c6bd737ca1fab317fa7c7c5c2c9e876b (patch) | |
| tree | 3755b673d1659b5a65d217ceabe138fd1a7b8dcb | |
| parent | 9c1fa866c6cdd296f7a218330b9f62f22c1aac5f (diff) | |
| parent | 6b5ff527e5bdff5724281e7afdcb829ab89682f9 (diff) | |
| download | mockwebserver-67bf89d8c6bd737ca1fab317fa7c7c5c2c9e876b.tar.gz | |
Merge "Reland "Build mockwebserver with core_current"" am: 5ea6d395c5
am: 6b5ff527e5
Change-Id: I0bfdbf8751cf783055d1c2fd6859a888410b4ea8
| -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) |