diff options
| author | 2020-06-26 20:17:02 +0100 | |
|---|---|---|
| committer | 2020-07-08 16:46:16 +0100 | |
| commit | 44f1d8404be0159ea95f74b0645157e74fe1b86e (patch) | |
| tree | c86a1b1e463f04ce0ef5923ab6b9dbb21882fdfa /apex/apex_test.go | |
| parent | ecc495fd096871feff67f598fc768ba972a84dd9 (diff) | |
Stop java_sdk_library_import from depending on source modules
Previously, java_sdk_library_import added the dependencies on its child
components in the deps mutator after prebuilts without a matching
source module are renamed to the source module name. That meant that
the java_sdk_library_import has to use the source module name and ended
up depending on the source module unless it was preferred.
This change adds a new component deps mutator that runs before the
PrebuiltRenameMutator so that the java_sdk_library_import can add
dependencies onto the prebuilt modules. It also updates an affected
test.
Bug: 159902351
Test: m nothing
Change-Id: I3576c4873302743e51aff547ea1497bef6d748ac
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index befb81483..c2cb2006d 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -233,6 +233,7 @@ func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*andr ctx.RegisterModuleType("apex_set", apexSetFactory) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) + ctx.PreArchMutators(android.RegisterComponentsMutator) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) cc.RegisterRequiredBuildComponentsForTest(ctx) |