diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-05-05 15:09:44 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-05-10 11:51:20 +0100 |
| commit | 57f8359fe332e7fe189b2ee649eed211e2648936 (patch) | |
| tree | 643c92c4a8ac73ae239fc94dde94460cf89db49a /sdk/bootclasspath_fragment_sdk_test.go | |
| parent | 5dda3e387e9efa7e6ef2f7f1bdda60bbec426ab5 (diff) | |
Derive deapexer module properties from transitive dependencies
Previously, the deapexer module properties were simply passed through
from the prebuilt_apex/apex_set modules. This change derives the
properties from the transitive dependencies of the modules so that it
can automatically include the contents of a bootclasspath_fragment
module without having to duplicate them in the exported_java_libs
property.
Part of this change involves moving the addition of dependencies onto
the prebuilt apex's contents from DepsMutator to ComponentDepsMutator
so that they can be visited in the createDeapexerModule() function. The
ComponentDepsMutator runs before prebuilts without matching sources are
renamed to match the source name which simplifies the process of adding
dependencies directly onto the prebuilts.
The deapexerDeps method was renamed as the dependencies are added both
for use by deapexer and also to create APEX variants for access by
platform_bootclasspath so the name was confusing.
Bug: 187266082
Test: m nothing
m SOONG_CONFIG_art_module_source_build=false nothing
- this fails but not because of missing APEX variants
Change-Id: Icb4f883e7d2b63739e5ff0dc6edb8a906d80189b
Diffstat (limited to 'sdk/bootclasspath_fragment_sdk_test.go')
| -rw-r--r-- | sdk/bootclasspath_fragment_sdk_test.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sdk/bootclasspath_fragment_sdk_test.go b/sdk/bootclasspath_fragment_sdk_test.go index 0f2fd5436..e91546e0b 100644 --- a/sdk/bootclasspath_fragment_sdk_test.go +++ b/sdk/bootclasspath_fragment_sdk_test.go @@ -95,9 +95,6 @@ func TestSnapshotWithBootclasspathFragment_ImageName(t *testing.T) { prebuilt_apex { name: "com.android.art", src: "art.apex", - exported_java_libs: [ - "mybootlib", - ], exported_bootclasspath_fragments: [ "mybootclasspathfragment", ], |