commit e441903a5f40ab00a49d76f5e9570a04ea80f74e
author Jiyong Park <jiyong@google.com> Mon Feb 19 15:30:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 19 15:30:38 2018 +0000
tree 3755b673d1659b5a65d217ceabe138fd1a7b8dcb
parent cc5bac0a575f83246ab4b2696f19497f63d90f00
parent 67bf89d8c6bd737ca1fab317fa7c7c5c2c9e876b

Merge "Reland "Build mockwebserver with core_current"" am: 5ea6d395c5 am: 6b5ff527e5
am: 67bf89d8c6

Change-Id: I06315e5155f7b0be8513faea25447c6338f027ea

Android.mk

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)