diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-05-05 15:05:47 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-08 16:23:13 +0100 |
| commit | 40e8a6206dac15b83c2c3a43d250360c046866b9 (patch) | |
| tree | 3ae6a37cc20fffcba40ebae710ff09f7d58c11cc | |
| parent | 48e3853d12833150d7626d7179caf4cfb82022cc (diff) | |
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.
The SpannedTestUtils class which is built into the production
Dialer app contains references to JUnit. Rather then embed JUnit in
Dialer it was excluded from the build. It is not actually used at
all anywhere in Dialer app so may even be able to be deleted.
Bug: 30188076
Test: make checkbuild
Change-Id: I37a618deba48d87a1a03d82ad4022233b408a788
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index b00519f48..bd9e63fc7 100644 --- a/Android.mk +++ b/Android.mk @@ -41,6 +41,10 @@ EXCLUDE_FILES := \ $(BASE_DIR)/incallui/maps/impl/MapsModule.java \ $(BASE_DIR)/incallui/maps/impl/StaticMapFragment.java +# Exclude testing only class, not used anywhere here +EXCLUDE_FILES += \ + $(BASE_DIR)/contacts/common/format/testing/SpannedTestUtils.java + # All Dialers resources. # find . -type d -name "res" | uniq | sort RES_DIRS := \ |