Snap for 4612226 from e441903a5f40ab00a49d76f5e9570a04ea80f74e to pi-release
Change-Id: I9154b61a0ce144a4ea63badda39ebf0b0e7342df
diff --git a/Android.mk b/Android.mk
index 3134ef5..ad2433b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,8 +21,10 @@
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)
