diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-03-01 12:31:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-01 12:31:03 +0000 |
| commit | 5edf30c23dcc8b6b233fef7139625c85d34109d4 (patch) | |
| tree | 27bbc22a588ff927aebaafda553bd719061eb3ba | |
| parent | 95880e5eb13dc3ba8807771b45c1803198e05586 (diff) | |
| parent | af87c61eb15fc97df19cb95a84ab6ced01e6b276 (diff) | |
| download | okhttp-o-preview.tar.gz | |
Merge "Add a -testdex variant for ART run-tests."android-o-preview-1android-n-mr2-preview-2o-preview
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -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 |