diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-11 07:23:27 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-03-11 09:40:02 +0000 |
| commit | 4f0a75abded278f9a6eade900c0c5abe718a4409 (patch) | |
| tree | 6b708db07355f97dcae95f19f2e19aba05d24a73 /java/system_modules_test.go | |
| parent | c52bea9555086692a7afc0dc5cf36b60ca430057 (diff) | |
Ensure java_system_modules_import uses prebuilts
Make sure that java_system_modules_import always depends on the
prebuilt by adding dependencies in the ComponentDepsMutator() method
which is called before prebuilts without a corresponding source are
renamed from prebuilt_<x> to <x>. That requires the prebuilt_ prefix
to be provided but it ensures that the dependencies are safe.
Similar logic also makes sure java_system_modules always depends on
the source module and not on a renamed prebuilt module.
Bug: 182402568
Test: m nothing
Change-Id: I30db95978f5d9b205951011edf40585ee36c0c4c
Diffstat (limited to 'java/system_modules_test.go')
| -rw-r--r-- | java/system_modules_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/system_modules_test.go b/java/system_modules_test.go index a8d7b0210..44049ee6b 100644 --- a/java/system_modules_test.go +++ b/java/system_modules_test.go @@ -107,7 +107,6 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs // The expected paths are the header jars from the renamed prebuilt input modules. - // TODO(b/182402568) - these should be depending on the prebuilts - expectedPrebuiltPaths := normalizedPathsToHeaderJars(result, "system-module1", "system-module2") + expectedPrebuiltPaths := normalizedPathsToHeaderJars(result, "prebuilt_system-module1", "prebuilt_system-module2") result.AssertArrayString("prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) } |