diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-07 13:15:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 13:15:06 +0000 |
| commit | e79665e3657171f55a979ca558ebe3c3dbf108d2 (patch) | |
| tree | 0e08c87b3316fb4a0c3c77dd00f0ecfb9d9eb567 | |
| parent | 89fb1b9fdc7f5c48d4983fad62af62c1b780e428 (diff) | |
| parent | b73f9e18713cfdaeac6a325e5dfda0bb01ae31fe (diff) | |
| download | nist-pkits-e79665e3657171f55a979ca558ebe3c3dbf108d2.tar.gz | |
Merge "Replace core-junit with junit" am: 2b483ecb8b am: 6423c63a15android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4
am: b73f9e1871
Change-Id: I5310d18a78f134896a4fb898edc995afa9ce2e95
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_RESOURCE_DIRS := res LOCAL_MODULE := nist-pkix-tests -LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit +LOCAL_JAVA_LIBRARIES := core-oj core-libart junit LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |