diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-01-09 12:41:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-09 12:41:00 +0000 |
| commit | e7c05ea7fda1ef673f994e52f940d65a13e74c1b (patch) | |
| tree | 32f41762c39b78bbc82e3008f622000671860c6f | |
| parent | 7354b4f34e693165f4f49d154fe58844bf5d4706 (diff) | |
| parent | 34f5ae7222078e3f922f1a8cf56a5fcc6fbdf099 (diff) | |
| download | jetty-e7c05ea7fda1ef673f994e52f940d65a13e74c1b.tar.gz | |
Add a 'jetty' prefix to jetty-specific slf4j build targets am: b209239f5a
am: 34f5ae7222
Change-Id: I730baa05c8ac263a52c021d152f5067920c22a7d
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -33,10 +33,10 @@ LOCAL_MODULE_TAGS := optional 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 $(BUILD_STATIC_JAVA_LIBRARY) 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) |