diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-01-05 15:58:15 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-01-06 15:51:27 +0000 |
| commit | b209239f5a3a8b59418154d8fd1aba9ec4d00ac5 (patch) | |
| tree | 32f41762c39b78bbc82e3008f622000671860c6f | |
| parent | 7354b4f34e693165f4f49d154fe58844bf5d4706 (diff) | |
| download | jetty-sdk-release.tar.gz | |
Add a 'jetty' prefix to jetty-specific slf4j build targetsandroid-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1sdk-releaseo-preview
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
| -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) |