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

Merge "Use OutputFilesProvider on prebuilt_apex and apex_set" into main

Browse Source
This commit is contained in:
Zi Wang
2024-06-17 21:07:13 +00:00
committed by Gerrit Code Review
parent f9fc13dd78 1587b9ccaf
commit c401229e18
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apex/prebuilt.go
View File

@@ -588,15 +588,6 @@ func (a *Prebuilt) hasSanitizedSource(sanitizer string) bool {
return false return false
} }
func (p *Prebuilt) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
return android.Paths{p.outputApex}, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
}
// prebuilt_apex imports an `.apex` file into the build graph as if it was built with apex. // prebuilt_apex imports an `.apex` file into the build graph as if it was built with apex.
func PrebuiltFactory() android.Module { func PrebuiltFactory() android.Module {
module := &Prebuilt{} module := &Prebuilt{}
@@ -895,6 +886,8 @@ func (p *Prebuilt) GenerateAndroidBuildActions(ctx android.ModuleContext) {
p.installedFile = ctx.InstallFile(p.installDir, p.installFilename, p.inputApex, p.compatSymlinks...) p.installedFile = ctx.InstallFile(p.installDir, p.installFilename, p.inputApex, p.compatSymlinks...)
p.provenanceMetaDataFile = provenance.GenerateArtifactProvenanceMetaData(ctx, p.inputApex, p.installedFile) p.provenanceMetaDataFile = provenance.GenerateArtifactProvenanceMetaData(ctx, p.inputApex, p.installedFile)
} }
ctx.SetOutputFiles(android.Paths{p.outputApex}, "")
} }
func (p *Prebuilt) ProvenanceMetaDataFile() android.OutputPath { func (p *Prebuilt) ProvenanceMetaDataFile() android.OutputPath {
@@ -1010,15 +1003,6 @@ func (a *ApexSet) hasSanitizedSource(sanitizer string) bool {
return false return false
} }
func (a *ApexSet) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
return android.Paths{a.outputApex}, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
}
// prebuilt_apex imports an `.apex` file into the build graph as if it was built with apex. // prebuilt_apex imports an `.apex` file into the build graph as if it was built with apex.
func apexSetFactory() android.Module { func apexSetFactory() android.Module {
module := &ApexSet{} module := &ApexSet{}
@@ -1122,6 +1106,8 @@ func (a *ApexSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
for _, overridden := range a.prebuiltCommonProperties.Overrides { for _, overridden := range a.prebuiltCommonProperties.Overrides {
a.compatSymlinks = append(a.compatSymlinks, makeCompatSymlinks(overridden, ctx)...) a.compatSymlinks = append(a.compatSymlinks, makeCompatSymlinks(overridden, ctx)...)
} }
ctx.SetOutputFiles(android.Paths{a.outputApex}, "")
} }
type systemExtContext struct { type systemExtContext struct {