diff options
| author | Brett Chabot <brettchabot@android.com> | 2012-05-09 18:05:58 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@android.com> | 2012-05-10 21:57:04 -0700 |
| commit | 41b2b155ae49e696f71c65b8b30345663860127b (patch) | |
| tree | c5053fda481894c1b4605baca4bc3651ab288f64 /Android.mk | |
| parent | 131ae36bedb326432f4b830c12abfb1274cc391b (diff) | |
| download | junit-41b2b155ae49e696f71c65b8b30345663860127b.tar.gz | |
Build junit for android.test.runner.
Build the junit classes that go into android.test.runner from
external/junit, rather than having copies of the code in frameworks/base.
Bug 5826326
Change-Id: I363d0788d4ac1890aef0aa5a7e867175f667b8d5
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -26,11 +26,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) # note: ideally this should be junit-host, but leave as is for now to avoid # changing all its dependencies LOCAL_MODULE := junit - LOCAL_MODULE_TAGS := optional - LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host - include $(BUILD_HOST_JAVA_LIBRARY) # ---------------------------------- @@ -71,6 +68,17 @@ include $(BUILD_HOST_JAVA_LIBRARY) endif #------------------------------------------------------- +# build a junit-runner jar representing the +# junit classes in the frameworks/base android.test.runner.jar + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(junit-runner-files) +LOCAL_MODULE := junit-runner +LOCAL_MODULE_TAGS := optional +include $(BUILD_STATIC_JAVA_LIBRARY) + +#------------------------------------------------------- # build a junit4-target jar representing the # classes in external/junit that are not in the core public API 4 # Note: 'core' here means excluding the classes that are contained @@ -95,7 +103,3 @@ LOCAL_SDK_VERSION := 4 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest include $(BUILD_STATIC_JAVA_LIBRARY) - - - - |