diff options
| author | Paul Duffin <paulduffin@google.com> | 2018-01-05 15:11:18 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2018-01-30 12:39:09 +0000 |
| commit | bee7cce828e0e876b20d4d89706f87f56e3a2dc2 (patch) | |
| tree | bcac2144af4fc380fc1200a2e883c99d6e23e4c7 | |
| parent | cc600d6d47572a338ec9836b9e8232172f065ae1 (diff) | |
Add android.test.legacy target
Adds a library that builds against the public API and so can be safely
statically included into applications to avoid them having to depend
on the android.test.base and android.test.runner runtime libraries.
(cherry picked from commit a70f66cb5e40105d4b0ec535f011eea83a38c86a)
Bug: 30188076
Test: make checkbuild
Change-Id: Ibd8cb61d00a65dbcf630672706323e42d82e6ba2
Merged-In: Iae7e3c64392e11035322092ed8e194740ba2d321
| -rw-r--r-- | test-base/Android.bp | 20 | ||||
| -rw-r--r-- | test-runner/Android.mk | 15 |
2 files changed, 35 insertions, 0 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index a42dc5a10ec9..ccf57b00a379 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -64,6 +64,26 @@ java_library_static { jarjar_rules: "jarjar-rules.txt", } +// Build the android.test.base-minus-junit library +// =============================================== +// This contains the android.test classes from android.test.base plus +// the com.android.internal.util.Predicate[s] classes. This is only +// intended for inclusion in the android.test.legacy static library and +// must not be used elsewhere. +java_library_static { + name: "android.test.base-minus-junit", + + srcs: [ + "src/android/**/*.java", + "src/com/**/*.java", + ], + + sdk_version: "current", + libs: [ + "junit", + ], +} + // Build the legacy-android-test library // ===================================== // This contains the android.test classes that were in Android API level 25, diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 706f6364ef8d..f5c2bc690494 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -117,5 +117,20 @@ update-android-test-runner-api: $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) | $(ACP) endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true +# Build the android.test.legacy library +# ===================================== +include $(CLEAR_VARS) + +LOCAL_MODULE := android.test.legacy + +LOCAL_SRC_FILES := $(call all-java-files-under, src/android) + +LOCAL_SDK_VERSION := current + +LOCAL_JAVA_LIBRARIES := android.test.mock.stubs junit +LOCAL_STATIC_JAVA_LIBRARIES := android.test.base-minus-junit + +include $(BUILD_STATIC_JAVA_LIBRARY) + # additionally, build unit tests in a separate .apk include $(call all-makefiles-under,$(LOCAL_PATH)) |