diff options
author | Paul Duffin <paulduffin@google.com> | 2016-12-01 13:20:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-01 13:20:51 +0000 |
commit | a49409b51f0bafe428c4d1bf73e36ee67d5234ab (patch) | |
tree | cdfe8b97dca2f643ac833b594c6550fbf5d99986 | |
parent | e7eae51c63f2aa140ebeefaa2ab175ba06861110 (diff) | |
parent | 7888554b3c02e777868912aa826ba14e2900d18e (diff) | |
download | loganalysis-a49409b51f0bafe428c4d1bf73e36ee67d5234ab.tar.gz |
Merge "Use junit-host instead of junit" am: 75e4a422ec am: 3c8cd0cd4bandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4
am: 7888554b3c
Change-Id: Ibe7719c8be0dbf5f215e8b32374d8cb4fe4e7869
-rw-r--r-- | tests/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 32019a7..d5e8881 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -23,7 +23,7 @@ LOCAL_JAVACFLAGS += -g -Xlint LOCAL_MODULE := loganalysis-tests LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := easymock junit +LOCAL_STATIC_JAVA_LIBRARIES := easymock junit-host LOCAL_JAVA_LIBRARIES := loganalysis include $(BUILD_HOST_JAVA_LIBRARY) |