diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-06-13 12:28:58 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-06-13 12:28:58 +0100 |
| commit | 03f1257717439ca8846c81de94afc4cf27c102c1 (patch) | |
| tree | 94b7bca538a1f4ccbea2749b534d2ca983b0b597 /tck-android | |
| parent | a3ef09de71261e043b85a748cc7d73359dd5e6fe (diff) | |
| download | objenesis-03f1257717439ca8846c81de94afc4cf27c102c1.tar.gz | |
Fix dependencies of packages that target earlier releases
A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.
This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* tck-android/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because ObjenesisTck's manifest file (AndroidManifest.xml) targets
API level 25 and dynamically includes the android.test.runner
library at runtime so there is no point in statically including the
classes.
Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
ObjenesisTck uses classes from package android.test (possible
indirectly) and needs them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: Ib303c34dc1f47b6e720acabc582e217861d2a7e6
Diffstat (limited to 'tck-android')
| -rw-r--r-- | tck-android/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tck-android/Android.mk b/tck-android/Android.mk index 45c9bb0..e13d9ff 100644 --- a/tck-android/Android.mk +++ b/tck-android/Android.mk @@ -28,6 +28,7 @@ LOCAL_PACKAGE_NAME := ObjenesisTck LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform -LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck-target junit legacy-android-test +LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck-target junit +LOCAL_JAVA_LIBRARIES := legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) include $(BUILD_PACKAGE) |