summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2016-02-18 19:59:48 +0100
committerYohann Roussel <yroussel@google.com>2016-02-18 19:59:48 +0100
commitd8b7db714ff75c37a6fe5b228a1373e9300022f0 (patch)
tree5d638caa9e3e1e740c86e38c842a3637cd562cac
parent7bed9286f5ae2b2fc89dbcdd62cec570e58b99c4 (diff)
downloadjetty-d8b7db714ff75c37a6fe5b228a1373e9300022f0.tar.gz
Ignore debug info of jetty-util prebuilt
To workaround a Jack failure, possibly caused by malformed debug info. Bug: 27242662 Change-Id: I6dd57abe16b238152f402f974669ab9fdcb3b67e
-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)
+