diff options
| author | Jiyong Park <jiyong@google.com> | 2018-02-19 15:30:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-19 15:30:38 +0000 |
| commit | e441903a5f40ab00a49d76f5e9570a04ea80f74e (patch) | |
| tree | 3755b673d1659b5a65d217ceabe138fd1a7b8dcb | |
| parent | cc5bac0a575f83246ab4b2696f19497f63d90f00 (diff) | |
| parent | 67bf89d8c6bd737ca1fab317fa7c7c5c2c9e876b (diff) | |
| download | mockwebserver-pie-b4s4-dev.tar.gz | |
Merge "Reland "Build mockwebserver with core_current"" am: 5ea6d395c5 am: 6b5ff527e5android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 67bf89d8c6
Change-Id: I06315e5155f7b0be8513faea25447c6338f027ea
| -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) |