diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2018-02-14 11:01:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-14 11:01:57 +0000 |
| commit | cc5bac0a575f83246ab4b2696f19497f63d90f00 (patch) | |
| tree | 00e7f1cd1c919b30ac621f4cf43dcef22bb3f424 | |
| parent | 206b696006c5cad744b338ce43351696767c3cbd (diff) | |
| parent | 9c1fa866c6cdd296f7a218330b9f62f22c1aac5f (diff) | |
| download | mockwebserver-cc5bac0a575f83246ab4b2696f19497f63d90f00.tar.gz | |
Merge "Revert "Build mockwebserver with core_current"" am: 7c05da77a1 am: 21e85cb4dd
am: 9c1fa866c6
Change-Id: Iacbc5f6a29c9a22691be3b63579617b03ccaff2d
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -21,10 +21,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(mockwebserver_src_files) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := mockwebserver -# 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_JAVA_LIBRARIES := core-oj core-libart +LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |