commit 5174e04aa5c7f40e91886abf83a832e0d378d22d
author Divya Sharma <divyash@codeaurora.org> Tue Feb 20 12:32:31 2018 -0800
committer Divya Sharma <divyash@codeaurora.org> Tue Feb 20 12:32:31 2018 -0800
tree 1c4c34cefdd24ad6f517812fedadba610ec74f0f
parent a98e55fca4d6aa55549f8c2c80034f2d04118cf6
parent 6322cea968d0948324b087f72cb3884040fe36fb

PPR1.180219.001_AOSP_Merge

Change-Id: I7503440877ced34dc8baf57b3e7722795b38cd19

Android.mk

diff --git a/Android.mk b/Android.mk
index 8ac44b3..6e38ab2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,9 +22,9 @@
 LOCAL_JAVA_RESOURCE_DIRS := MockFtpServer/src/main/resources
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := mockftpserver
-LOCAL_JAVA_LIBRARIES := slf4j-jdk14 core-oj core-libart
+LOCAL_JAVA_LIBRARIES := slf4j-jdk14
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_SDK_VERSION := core_current
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)