diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-03-01 12:41:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-01 12:41:15 +0000 |
| commit | bc1c89a8bf21b91dd52036f6ef63489fc3bc779a (patch) | |
| tree | 27bbc22a588ff927aebaafda553bd719061eb3ba | |
| parent | 15f2bcf5c5207dffe9cfccf153cdff85afce8447 (diff) | |
| parent | 2baece252fc77206c0f894ea3ca060166292ca7e (diff) | |
| download | okhttp-oreo-vts-release.tar.gz | |
Merge "Add a -testdex variant for ART run-tests." am: 5edf30c23d am: 832e01a099android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1oreo-vts-releaseoreo-devoreo-cts-dev
am: 2baece252f
Change-Id: I4e8dd05272e1bcef6032c89f022856ad70ed36e9
| -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 |