diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:10 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:10 +0000 |
| commit | fb7f099c037e90051c93a867ce67bf541c5d4e9b (patch) | |
| tree | 2d0743ab1290283a8c2c3269e0cbbd3b2511d516 | |
| parent | dcc9b5f4faa6e71cbf8e6b7dbc7be542be4ef236 (diff) | |
| download | chips-o-preview.tar.gz | |
Prepare for removal of junit and android.test classes from Android API (step 1)android-o-preview-1android-n-mr2-preview-2o-preview
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: Iceae2a5949a533f0c94dfe87db3bb75e10dcfbbf
| -rw-r--r-- | tests/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 21a8050..fa11974 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -20,7 +20,7 @@ LOCAL_PACKAGE_NAME := libChipsTests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform -LOCAL_STATIC_JAVA_LIBRARIES += libchips +LOCAL_STATIC_JAVA_LIBRARIES := libchips legacy-android-test junit LOCAL_RESOURCE_DIR := frameworks/opt/chips/res/ LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips |