commit 34f5ae7222078e3f922f1a8cf56a5fcc6fbdf099
author Tobias Thierer <tobiast@google.com> Mon Jan 09 12:35:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 09 12:35:30 2017 +0000
tree 32f41762c39b78bbc82e3008f622000671860c6f
parent 7354b4f34e693165f4f49d154fe58844bf5d4706
parent b209239f5a3a8b59418154d8fd1aba9ec4d00ac5

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

Change-Id: I112c4f8453754935f6c5ba52852cd4e5532b494b

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)