From 321c575bb9505c3c006b73ac646eeec32513e6cd Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Wed, 14 Feb 2018 13:54:53 +0900
Subject: Reland "Build mockwebserver with core_current"

core_current is a set of Android SDK having core Java APIs only. This
fixes the link-type check warning when this lib is used from an app
built with SDK.

Bug: 69899800
Test: m -j mockwebserver is succecssful
Test: m -j CtsVerifier does not show link-type warning on this
Test: master-art builds
Change-Id: I87d312fc5d104af76ab30fda7587b8559ac9d4d1
---
 Android.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 3134ef5..ad2433b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
 
-- 
cgit v1.2.3