diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-11-28 14:50:09 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2016-11-28 14:52:54 +0000 |
| commit | e20202f9c99c5b8f9f4ebdaa91f751d66f974f86 (patch) | |
| tree | 7b0973ad91143191db019e291a5b802f79aeb88d | |
| parent | 6f56afc88379d1e115903220a06a5f4f6a6cb896 (diff) | |
| download | testng-e20202f9c99c5b8f9f4ebdaa91f751d66f974f86.tar.gz | |
Remove use of junit4-target when used with junit-targetdex
Change to external/junit means that junit-targetdex now includes
everything that is in junit4-target so it is no longer necessary
to use them both.
Bug: 30188076
Test: make checkbuild and ran cts-tradefed -m CtsLibcoreOjTestCases
Change-Id: I6f7107cf111b0b2b437d38e48ee590846e991ecf
| -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) |