diff options
| author | 2024-01-25 19:25:42 +0000 | |
|---|---|---|
| committer | 2024-01-25 22:35:54 +0000 | |
| commit | f5e03f1c1a524a7d9e49417b846f5e2c8d4027a0 (patch) | |
| tree | d932df298a34317430551a44d26c51e2e18a1ae6 /apex/prebuilt.go | |
| parent | 1f4475cee17eca02464def554e5c924b14d18885 (diff) | |
Move ApexBundleInfoProvider from apex/ to android/
This provider contains information about the contents of an apex and is
set during the post deps phase of top-level source and prebuilt apexes.
java.dexpreoptDisabled needs to distinguish between platform and apex
variants of a library to prevent creating duplicate ninja rules. It does
so by looking at ApexInfoProvider. This provider gets set on the ctx of
the java_library being dexpreopted.
In case of prebuilts, these rules are being moved to the top-level
prebuilt apexes. Move ApexInfoBundleProvider from apex to android so
that java.dexpreoptDisabled can consume this provider without running
into a golang circular dependency. (java.dexpreoptDisabled will use this
provider in the next CL of this stack).
Test: go build ./android ./apex
Change-Id: I665abd9d0591eeb17b273cc822beb20690e6af09
Diffstat (limited to 'apex/prebuilt.go')
| -rw-r--r-- | apex/prebuilt.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 1ec38eb94..7dd0a98b6 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -438,7 +438,7 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) { // Create contents for the prebuilt_apex and store it away for later use. apexContents := android.NewApexContents(contents) - android.SetProvider(mctx, ApexBundleInfoProvider, ApexBundleInfo{ + android.SetProvider(mctx, android.ApexBundleInfoProvider, android.ApexBundleInfo{ Contents: apexContents, }) |