diff options
| author | 2024-09-06 06:07:42 +0000 | |
|---|---|---|
| committer | 2024-09-06 06:07:42 +0000 | |
| commit | fae5ec8bbca887066716029a4923c110d819c958 (patch) | |
| tree | 9ca819979f6141bab733c14445fe7b8083ed3744 /java/bootclasspath_fragment.go | |
| parent | 4301e29a02937b1ef1b50e7660ee33205bc33d9c (diff) | |
| parent | 003452ff9c3b0dfe57be563d647c9a8dd76e0569 (diff) | |
Merge changes I505a7ad8,I92d88199 into main
* changes:
Disable source apex variant using apex_available_name
Skip `contents` validation of source bootclasspath fragments
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index bef3b58c8..fe4cc7685 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -463,6 +463,12 @@ func (b *BootclasspathFragmentModule) DepsMutator(ctx android.BottomUpMutatorCon // Add a dependency onto the dex2oat tool which is needed for creating the boot image. The // path is retrieved from the dependency by GetGlobalSoongConfig(ctx). dexpreopt.RegisterToolDeps(ctx) + + // Add a dependency to `all_apex_contributions` to determine if prebuilts are active. + // If prebuilts are active, `contents` validation on the source bootclasspath fragment should be disabled. + if _, isPrebuiltModule := ctx.Module().(*PrebuiltBootclasspathFragmentModule); !isPrebuiltModule { + ctx.AddDependency(b, android.AcDepTag, "all_apex_contributions") + } } func (b *BootclasspathFragmentModule) BootclasspathDepsMutator(ctx android.BottomUpMutatorContext) { |