diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-01-09 12:46:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-09 12:46:00 +0000 |
| commit | 3077b6f9426ccafb6bd5c00a748e1d40af9e1ae5 (patch) | |
| tree | 32f41762c39b78bbc82e3008f622000671860c6f | |
| parent | 7354b4f34e693165f4f49d154fe58844bf5d4706 (diff) | |
| parent | e7c05ea7fda1ef673f994e52f940d65a13e74c1b (diff) | |
| download | jetty-nougat-iot-release.tar.gz | |
Add a 'jetty' prefix to jetty-specific slf4j build targets am: b209239f5a am: 34f5ae7222HEADandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4nougat-iot-releasen-iot-preview-4mastermain
am: e7c05ea7fd
Change-Id: I5a96023f7c783f4ad7f02159843f27d87d15b8cf
| -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) |