commit 3077b6f9426ccafb6bd5c00a748e1d40af9e1ae5
author Tobias Thierer <tobiast@google.com> Mon Jan 09 12:46:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 09 12:46:00 2017 +0000
tree 32f41762c39b78bbc82e3008f622000671860c6f
parent 7354b4f34e693165f4f49d154fe58844bf5d4706
parent e7c05ea7fda1ef673f994e52f940d65a13e74c1b

Add a 'jetty' prefix to jetty-specific slf4j build targets am: b209239f5a am: 34f5ae7222
am: e7c05ea7fd

Change-Id: I5a96023f7c783f4ad7f02159843f27d87d15b8cf

Android.mk

diff --git a/Android.mk b/Android.mk
index 6a5d2f0..cc2169b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,10 +33,10 @@
 LOCAL_SDK_VERSION := current
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+	jetty-slf4j-api \
+	jetty-slf4j-jdk14 \
 	jetty-util \
-	servlet-api \
-	slf4j-api \
-	slf4j-jdk14
+	servlet-api
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
@@ -47,9 +47,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-	servlet-api:lib/javax.servlet-3.0.0.v201112011016.jar \
-	slf4j-api:lib/slf4j-api-1.6.1.jar \
-	slf4j-jdk14:lib/slf4j-jdk14-1.6.1.jar \
+	jetty-slf4j-api:lib/slf4j-api-1.6.1.jar \
+	jetty-slf4j-jdk14:lib/slf4j-jdk14-1.6.1.jar \
+	servlet-api:lib/javax.servlet-3.0.0.v201112011016.jar
 
 include $(BUILD_MULTI_PREBUILT)