diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-11-29 11:22:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-29 11:22:18 +0000 |
| commit | ad68c20b0b8a29e42b0c09bb35d6c06d6c78a9b6 (patch) | |
| tree | 7b0973ad91143191db019e291a5b802f79aeb88d | |
| parent | bab2c37bb5a851032d525b3e4b2a8b7790916c6a (diff) | |
| parent | 3c5ed5c5bdf384e1900a776aa98bce0099e753a6 (diff) | |
| download | testng-ad68c20b0b8a29e42b0c09bb35d6c06d6c78a9b6.tar.gz | |
Remove use of junit4-target when used with junit-targetdex am: e20202f9c9 am: 05053b0bd3
am: 3c5ed5c5bd
Change-Id: I4e540a2ff318ae81d1fdb9de1a15478352f3ada7
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -61,7 +61,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(testng_src_files) LOCAL_MODULE := testng LOCAL_STATIC_JAVA_LIBRARIES := jcommander snakeyaml guice -LOCAL_JAVA_LIBRARIES := junit-targetdex junit4-target +LOCAL_JAVA_LIBRARIES := junit-targetdex include $(LOCAL_PATH)/GenerateTemplates.mk # Generate Version.java include $(BUILD_STATIC_JAVA_LIBRARY) @@ -70,7 +70,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(testng_src_files) LOCAL_MODULE := testng-lib LOCAL_STATIC_JAVA_LIBRARIES := jcommander snakeyaml guice -LOCAL_JAVA_LIBRARIES := junit-targetdex junit4-target +LOCAL_JAVA_LIBRARIES := junit-targetdex include $(LOCAL_PATH)/GenerateTemplates.mk # Generate Version.java include $(BUILD_JAVA_LIBRARY) |