Add a 'jetty' prefix to jetty-specific slf4j build targets
This is in order to not conflict with build targets to be added
to external/slf4j, which will build from source rather than from
the jetty-specific .jar dependencies.
Bug: 29574477
Test: make jetty
Change-Id: I6ce2c4b9b300e8b96446f66e9249953a29302c81
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)
