StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup usages of Dex2oatDepTag" am: 958408d921

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652452

Change-Id: I6eea8ea370adf745908b9e8b5d669eb182c92c1c
This commit is contained in:
Paul Duffin
2021-03-24 22:34:02 +00:00
committed by Automerger Merge Worker
parent cf615d8640 958408d921
commit 15204cf1ea
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -29,7 +29,6 @@ import (
"android/soong/android" "android/soong/android"
"android/soong/bpf" "android/soong/bpf"
"android/soong/cc" "android/soong/cc"
"android/soong/dexpreopt"
prebuilt_etc "android/soong/etc" prebuilt_etc "android/soong/etc"
"android/soong/filesystem" "android/soong/filesystem"
"android/soong/java" "android/soong/java"
@@ -1573,9 +1572,6 @@ func (a *apexBundle) WalkPayloadDeps(ctx android.ModuleContext, do android.Paylo
if dt, ok := depTag.(dependencyTag); ok && !dt.payload { if dt, ok := depTag.(dependencyTag); ok && !dt.payload {
return false return false
} }
if depTag == dexpreopt.Dex2oatDepTag {
return false
}
ai := ctx.OtherModuleProvider(child, android.ApexInfoProvider).(android.ApexInfo) ai := ctx.OtherModuleProvider(child, android.ApexInfoProvider).(android.ApexInfo)
externalDep := !android.InList(ctx.ModuleName(), ai.InApexes) externalDep := !android.InList(ctx.ModuleName(), ai.InApexes)

18
dexpreopt/config.go
View File

@@ -352,9 +352,23 @@ func dex2oatModuleName(config android.Config) string {
} }
} }
var Dex2oatDepTag = struct { type dex2oatDependencyTag struct {
blueprint.BaseDependencyTag blueprint.BaseDependencyTag
}{} }
func (d dex2oatDependencyTag) ExcludeFromVisibilityEnforcement() {
}
func (d dex2oatDependencyTag) ExcludeFromApexContents() {
}
// Dex2oatDepTag represents the dependency onto the dex2oatd module. It is added to any module that
// needs dexpreopting and so it makes no sense for it to be checked for visibility or included in
// the apex.
var Dex2oatDepTag = dex2oatDependencyTag{}
var _ android.ExcludeFromVisibilityEnforcementTag = Dex2oatDepTag
var _ android.ExcludeFromApexContentsTag = Dex2oatDepTag
// RegisterToolDeps adds the necessary dependencies to binary modules for tools // RegisterToolDeps adds the necessary dependencies to binary modules for tools
// that are required later when Get(Cached)GlobalSoongConfig is called. It // that are required later when Get(Cached)GlobalSoongConfig is called. It

4
java/boot_image.go
View File

@@ -96,10 +96,6 @@ func (i BootImageInfo) AndroidBootImageFilesByArchType() map[android.ArchType]an
func (b *BootImageModule) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool { func (b *BootImageModule) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
tag := ctx.OtherModuleDependencyTag(dep) tag := ctx.OtherModuleDependencyTag(dep)
if tag == dexpreopt.Dex2oatDepTag {
// The dex2oat tool is only needed for building and is not required in the apex.
return false
}
if android.IsMetaDependencyTag(tag) { if android.IsMetaDependencyTag(tag) {
// Cross-cutting metadata dependencies are metadata. // Cross-cutting metadata dependencies are metadata.
return false return false