diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-07 13:07:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 13:07:34 +0000 |
| commit | 480165aee06034a58cc3ee67a45527f3922e2e1f (patch) | |
| tree | 2208e0e0dd66df54d317e5371a406fb49480a06c | |
| parent | 68f1eabd5a6f12c9a1544dc8f8ebca63d9e12a1a (diff) | |
| parent | a22b7fe69a53bd00da4abfb41f02b4abffa356ec (diff) | |
| download | okhttp-480165aee06034a58cc3ee67a45527f3922e2e1f.tar.gz | |
Merge "Replace junit4-target with junit" am: 0663ccec7f
am: a22b7fe69a
Change-Id: I2ea949b5de8b2a2491851a4c951d3220a13228f0
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -67,7 +67,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := okhttp-tests-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_test_src_files) -LOCAL_JAVA_LIBRARIES := core-oj core-libart okhttp-nojarjar junit4-target bouncycastle-nojarjar conscrypt +LOCAL_JAVA_LIBRARIES := core-oj core-libart okhttp-nojarjar junit bouncycastle-nojarjar conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_JAVA_LANGUAGE_VERSION := 1.7 |