diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:09 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:09 +0000 |
| commit | 3a87d4fea4976e369d423ee6b080160b5d50cddf (patch) | |
| tree | aabfe157402c29193a9828df3fc73a0a73fadcf3 /samples/ApiDemos | |
| parent | 4a67eaddd6475d33224c7c446455676b75e24a5b (diff) | |
| download | android_development-3a87d4fea4976e369d423ee6b080160b5d50cddf.tar.gz android_development-3a87d4fea4976e369d423ee6b080160b5d50cddf.tar.bz2 android_development-3a87d4fea4976e369d423ee6b080160b5d50cddf.zip | |
Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: I03f7836a1081acda5ed2c6e43cb24e9dc23b944c
Diffstat (limited to 'samples/ApiDemos')
| -rw-r--r-- | samples/ApiDemos/tests/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/samples/ApiDemos/tests/Android.mk b/samples/ApiDemos/tests/Android.mk index f975662dc..ed661a002 100644 --- a/samples/ApiDemos/tests/Android.mk +++ b/samples/ApiDemos/tests/Android.mk @@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) |