summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2016-02-18 19:59:48 +0100
committerNeil Fuller <nfuller@google.com>2016-02-23 09:52:28 +0000
commit3dddeb0b1333408963a5ec550cd9cc64cd9c646d (patch)
tree1c9148f96c54e57e0aba7044373c125fb6876fad
parent806b0b93225bdf4a36d560351642126100e1950e (diff)
downloadjetty-3dddeb0b1333408963a5ec550cd9cc64cd9c646d.tar.gz
Ignore debug info of jetty-util prebuilt
To workaround a Jack failure, possibly caused by malformed debug info. Bug: 27242662 (cherry picked from commit d8b7db714ff75c37a6fe5b228a1373e9300022f0) Change-Id: I82bb302498abcad741a18e42f73cd2331233cc78
-rw-r--r--Android.mk12
1 files changed, 11 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index f7ed668..d4859ec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,8 +48,18 @@ include $(CLEAR_VARS)
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
servlet-api:lib/javax.servlet-3.0.0.v201112011016.jar \
- jetty-util:lib/jetty-util-6.1.26.jar \
slf4j-api:lib/slf4j-api-1.6.1.jar \
slf4j-jdk14:lib/slf4j-jdk14-1.6.1.jar \
include $(BUILD_MULTI_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := jetty-util
+LOCAL_SRC_FILES := lib/jetty-util-6.1.26.jar
+LOCAL_JACK_FLAGS := -D jack.import.jar.debug-info=false
+
+include $(BUILD_PREBUILT)
+