diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-07 12:52:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-07 12:52:03 +0000 |
| commit | 0663ccec7ffe3cf4c6d7e9beb40ba11af96f3152 (patch) | |
| tree | 2208e0e0dd66df54d317e5371a406fb49480a06c | |
| parent | 9705d660e4a33ddfc25c4826e53522852ac53d37 (diff) | |
| parent | 6525d58b908bdbb5d3596a4f684dac5d4c74b3ec (diff) | |
| download | okhttp-0663ccec7ffe3cf4c6d7e9beb40ba11af96f3152.tar.gz | |
Merge "Replace junit4-target with junit"android-n-mr2-preview-1
| -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 |