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

Merge "Use OutputFilesProvider on aconfig_declarations_group" into main am: 8f3fd0a049

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

Change-Id: I5e6a86cc7ac06b2a327ab11eee31bfa0c7aef585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2024-06-14 00:20:46 +00:00
committed by Automerger Merge Worker
parent 4873775c9f 8f3fd0a049
commit 2d92d1dc3a
3 changed files with 2 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
aconfig/aconfig_declarations.go
View File

@@ -15,7 +15,6 @@
package aconfig
import (
"fmt"
"strings"
"android/soong/android"
@@ -44,8 +43,6 @@ type DeclarationsModule struct {
// The flags will only be repackaged if this prop is true.
Exportable bool
}
intermediatePath android.WritablePath
}
func DeclarationsFactory() android.Module {
@@ -86,18 +83,6 @@ func (module *DeclarationsModule) DepsMutator(ctx android.BottomUpMutatorContext
}
}
func (module *DeclarationsModule) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
// The default output of this module is the intermediates format, which is
// not installable and in a private format that no other rules can handle
// correctly.
return []android.Path{module.intermediatePath}, nil
default:
return nil, fmt.Errorf("unsupported aconfig_declarations module reference tag %q", tag)
}
}
func joinAndPrefix(prefix string, values []string) string {
var sb strings.Builder
for _, v := range values {
@@ -171,5 +156,4 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module
IntermediateCacheOutputPath: intermediateCacheFilePath,
IntermediateDumpOutputPath: intermediateDumpFilePath,
})
}

15
aconfig/build_flags/declarations.go
View File

@@ -15,7 +15,6 @@
package build_flags
import (
"fmt"
"strings"
"android/soong/android"
@@ -39,8 +38,6 @@ type DeclarationsModule struct {
// aconfig files, relative to this Android.bp file
Srcs []string `android:"path"`
}
intermediatePath android.WritablePath
}
func DeclarationsFactory() android.Module {
@@ -53,18 +50,6 @@ func DeclarationsFactory() android.Module {
return module
}
func (module *DeclarationsModule) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
// The default output of this module is the intermediates format, which is
// not installable and in a private format that no other rules can handle
// correctly.
return []android.Path{module.intermediatePath}, nil
default:
return nil, fmt.Errorf("unsupported build_flags_declarations module reference tag %q", tag)
}
}
func joinAndPrefix(prefix string, values []string) string {
var sb strings.Builder
for _, v := range values {

15
aconfig/codegen/aconfig_declarations_group.go
View File

@@ -15,7 +15,6 @@
package codegen
import (
"fmt"
"maps"
"android/soong/android"
@@ -115,19 +114,9 @@ func (adg *AconfigDeclarationsGroup) GenerateAndroidBuildActions(ctx android.Mod
Srcjars: adg.javaSrcjars,
ModeInfos: adg.modeInfos,
})
}
var _ android.OutputFileProducer = (*AconfigDeclarationsGroup)(nil)
func (adg *AconfigDeclarationsGroup) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
return adg.intermediateCacheOutputPaths, nil
case ".srcjars":
return adg.javaSrcjars, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %s", tag)
}
ctx.SetOutputFiles(adg.intermediateCacheOutputPaths, "")
ctx.SetOutputFiles(adg.javaSrcjars, ".srcjars")
}
func (adg *AconfigDeclarationsGroup) Srcjars() android.Paths {