aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2017-03-01 10:04:07 +0000
committerNicolas Geoffray <ngeoffray@google.com>2017-03-01 10:48:33 +0000
commitaf87c61eb15fc97df19cb95a84ab6ced01e6b276 (patch)
tree27bbc22a588ff927aebaafda553bd719061eb3ba
parent95880e5eb13dc3ba8807771b45c1803198e05586 (diff)
downloadokhttp-af87c61eb15fc97df19cb95a84ab6ced01e6b276.tar.gz
Add a -testdex variant for ART run-tests.
bug:24535627 Change-Id: Ia26810f1f79f573161c0ca0b80a1dcabc883aec8
-rw-r--r--Android.mk14
1 files changed, 14 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 2312391..cea6eb5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,6 +52,20 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_JAVA_LIBRARY)
+# A guaranteed unstripped version of okhttp.
+# The build system may or may not strip the okhttp jar, but this one will
+# not be stripped. See b/24535627.
+include $(CLEAR_VARS)
+LOCAL_MODULE := okhttp-testdex
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(okhttp_system_src_files)
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+LOCAL_JAVA_LIBRARIES := core-oj core-libart
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+include $(BUILD_JAVA_LIBRARY)
+
# non-jarjar'd version of okhttp to compile the tests against
include $(CLEAR_VARS)
LOCAL_MODULE := okhttp-nojarjar