tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gofmt soong

Browse source 
Test: Presubmits
Change-Id: Ia76c35ba51685eca29df51738000eacd3f43ce20
This commit is contained in:
Cole Faust 2023-10-18 17:38:40 -07:00
parent 03787bea6d
commit 06ea531ab3
11 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/allowlists/allowlists.go
View file

@ -437,7 +437,7 @@ var (
"system/libprocinfo": Bp2BuildDefaultTrue, "system/libprocinfo": Bp2BuildDefaultTrue,
"system/libvintf": Bp2BuildDefaultTrue, "system/libvintf": Bp2BuildDefaultTrue,
"system/libziparchive": Bp2BuildDefaultTrueRecursively, "system/libziparchive": Bp2BuildDefaultTrueRecursively,
"system/linkerconfig": Bp2BuildDefaultTrueRecursively, "system/linkerconfig": Bp2BuildDefaultTrueRecursively,
"system/logging": Bp2BuildDefaultTrueRecursively, "system/logging": Bp2BuildDefaultTrueRecursively,
"system/media": Bp2BuildDefaultTrue, "system/media": Bp2BuildDefaultTrue,
"system/media/alsa_utils": Bp2BuildDefaultTrueRecursively, "system/media/alsa_utils": Bp2BuildDefaultTrueRecursively,

6
android/bazel_paths.go
View file

@ -103,7 +103,7 @@ type BazelConversionPathContext interface {
// or ":<module>") and returns a Bazel-compatible label which corresponds to dependencies on the // or ":<module>") and returns a Bazel-compatible label which corresponds to dependencies on the
// module within the given ctx. // module within the given ctx.
func BazelLabelForModuleDeps(ctx Bp2buildMutatorContext, modules []string) bazel.LabelList { func BazelLabelForModuleDeps(ctx Bp2buildMutatorContext, modules []string) bazel.LabelList {
return BazelLabelForModuleDepsWithFn(ctx, modules, BazelModuleLabel, /*markAsDeps=*/true) return BazelLabelForModuleDepsWithFn(ctx, modules, BazelModuleLabel, true)
} }
// BazelLabelForModuleWholeDepsExcludes expects two lists: modules (containing modules to include in // BazelLabelForModuleWholeDepsExcludes expects two lists: modules (containing modules to include in
@ -154,11 +154,11 @@ func BazelLabelForModuleDepsWithFn(ctx Bp2buildMutatorContext, modules []string,
// the excluded dependencies. // the excluded dependencies.
func BazelLabelForModuleDepsExcludesWithFn(ctx Bp2buildMutatorContext, modules, excludes []string, func BazelLabelForModuleDepsExcludesWithFn(ctx Bp2buildMutatorContext, modules, excludes []string,
moduleToLabelFn func(BazelConversionPathContext, blueprint.Module) string) bazel.LabelList { moduleToLabelFn func(BazelConversionPathContext, blueprint.Module) string) bazel.LabelList {
moduleLabels := BazelLabelForModuleDepsWithFn(ctx, RemoveListFromList(modules, excludes), moduleToLabelFn, /*markAsDeps=*/true) moduleLabels := BazelLabelForModuleDepsWithFn(ctx, RemoveListFromList(modules, excludes), moduleToLabelFn, true)
if len(excludes) == 0 { if len(excludes) == 0 {
return moduleLabels return moduleLabels
} }
excludeLabels := BazelLabelForModuleDepsWithFn(ctx, excludes, moduleToLabelFn, /*markAsDeps=*/false) excludeLabels := BazelLabelForModuleDepsWithFn(ctx, excludes, moduleToLabelFn, false)
return bazel.LabelList{ return bazel.LabelList{
Includes: moduleLabels.Includes, Includes: moduleLabels.Includes,
Excludes: excludeLabels.Includes, Excludes: excludeLabels.Includes,

6
cc/bp2build.go
View file

@ -1904,7 +1904,7 @@ func xsdConfigCppTarget(xsd android.XsdConfigBp2buildTargets) string {
} }
func bazelLabelForWholeDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList { func bazelLabelForWholeDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {
return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticWholeModuleDeps, /*markAsDeps=*/true) return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticWholeModuleDeps, true)
} }
func bazelLabelForWholeDepsExcludes(ctx android.Bp2buildMutatorContext, modules, excludes []string) bazel.LabelList { func bazelLabelForWholeDepsExcludes(ctx android.Bp2buildMutatorContext, modules, excludes []string) bazel.LabelList {
@ -1916,11 +1916,11 @@ func bazelLabelForStaticDepsExcludes(ctx android.Bp2buildMutatorContext, modules
} }
func bazelLabelForStaticDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList { func bazelLabelForStaticDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {
return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticModule, /*markAsDeps=*/true) return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticModule, true)
} }
func bazelLabelForSharedDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList { func bazelLabelForSharedDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {
return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForSharedModule, /*markAsDeps=*/true) return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForSharedModule, true)
} }
func bazelLabelForHeaderDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList { func bazelLabelForHeaderDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {

14
cc/fuzz.go
View file

@ -357,10 +357,10 @@ func NewFuzzer(hod android.HostOrDeviceSupported) *Module {
// their architecture & target/host specific zip file. // their architecture & target/host specific zip file.
type ccRustFuzzPackager struct { type ccRustFuzzPackager struct {
fuzz.FuzzPackager fuzz.FuzzPackager
fuzzPackagingArchModules string fuzzPackagingArchModules string
fuzzTargetSharedDepsInstallPairs string fuzzTargetSharedDepsInstallPairs string
allFuzzTargetsName string allFuzzTargetsName string
onlyIncludePresubmits bool onlyIncludePresubmits bool
} }
func fuzzPackagingFactory() android.Singleton { func fuzzPackagingFactory() android.Singleton {
@ -369,7 +369,7 @@ func fuzzPackagingFactory() android.Singleton {
fuzzPackagingArchModules: "SOONG_FUZZ_PACKAGING_ARCH_MODULES", fuzzPackagingArchModules: "SOONG_FUZZ_PACKAGING_ARCH_MODULES",
fuzzTargetSharedDepsInstallPairs: "FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS", fuzzTargetSharedDepsInstallPairs: "FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS",
allFuzzTargetsName: "ALL_FUZZ_TARGETS", allFuzzTargetsName: "ALL_FUZZ_TARGETS",
onlyIncludePresubmits: false, onlyIncludePresubmits: false,
} }
return fuzzPackager return fuzzPackager
} }
@ -380,7 +380,7 @@ func fuzzPackagingFactoryPresubmit() android.Singleton {
fuzzPackagingArchModules: "SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODULES", fuzzPackagingArchModules: "SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODULES",
fuzzTargetSharedDepsInstallPairs: "PRESUBMIT_FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS", fuzzTargetSharedDepsInstallPairs: "PRESUBMIT_FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS",
allFuzzTargetsName: "ALL_PRESUBMIT_FUZZ_TARGETS", allFuzzTargetsName: "ALL_PRESUBMIT_FUZZ_TARGETS",
onlyIncludePresubmits: true, onlyIncludePresubmits: true,
} }
return fuzzPackager return fuzzPackager
} }
@ -451,7 +451,7 @@ func (s *ccRustFuzzPackager) GenerateBuildActions(ctx android.SingletonContext)
if fpm.FuzzProperties.Fuzz_config == nil { if fpm.FuzzProperties.Fuzz_config == nil {
return return
} }
if !BoolDefault(fpm.FuzzProperties.Fuzz_config.Use_for_presubmit, false){ if !BoolDefault(fpm.FuzzProperties.Fuzz_config.Use_for_presubmit, false) {
return return
} }
} }

15
cc/orderfile.go
View file

@ -58,17 +58,17 @@ func recordMissingOrderfile(ctx BaseModuleContext, missing string) {
type OrderfileProperties struct { type OrderfileProperties struct {
Orderfile struct { Orderfile struct {
Instrumentation *bool Instrumentation *bool
Order_file_path *string `android:"arch_variant"` Order_file_path *string `android:"arch_variant"`
Load_order_file *bool `android:"arch_variant"` Load_order_file *bool `android:"arch_variant"`
// Additional compiler flags to use when building this module // Additional compiler flags to use when building this module
// for orderfile profiling. // for orderfile profiling.
Cflags []string `android:"arch_variant"` Cflags []string `android:"arch_variant"`
} `android:"arch_variant"` } `android:"arch_variant"`
ShouldProfileModule bool `blueprint:"mutated"` ShouldProfileModule bool `blueprint:"mutated"`
OrderfileLoad bool `blueprint:"mutated"` OrderfileLoad bool `blueprint:"mutated"`
OrderfileInstrLink bool `blueprint:"mutated"` OrderfileInstrLink bool `blueprint:"mutated"`
} }
type orderfile struct { type orderfile struct {
@ -128,7 +128,6 @@ func (props *OrderfileProperties) addInstrumentationProfileGatherFlags(ctx Modul
return flags return flags
} }
func (props *OrderfileProperties) loadOrderfileFlags(ctx ModuleContext, file string) []string { func (props *OrderfileProperties) loadOrderfileFlags(ctx ModuleContext, file string) []string {
flags := []string{fmt.Sprintf(orderfileUseFormat, file)} flags := []string{fmt.Sprintf(orderfileUseFormat, file)}
flags = append(flags, orderfileOtherFlags...) flags = append(flags, orderfileOtherFlags...)
@ -217,7 +216,7 @@ func orderfileDepsMutator(mctx android.TopDownMutatorContext) {
if dep, ok := dep.(*Module); ok { if dep, ok := dep.(*Module); ok {
if m.orderfile.Properties.OrderfileInstrLink { if m.orderfile.Properties.OrderfileInstrLink {
dep.orderfile.Properties.OrderfileInstrLink = true; dep.orderfile.Properties.OrderfileInstrLink = true
} }
} }

24
cc/orderfile_test.go
View file

@ -15,8 +15,8 @@
package cc package cc
import ( import (
"testing"
"strings" "strings"
"testing"
"android/soong/android" "android/soong/android"
) )
@ -193,8 +193,8 @@ func TestOrderfileProfilePropagateStaticDeps(t *testing.T) {
} }
// Check cFlags of orderfile variant static libraries // Check cFlags of orderfile variant static libraries
libFooOfVariant := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static_orderfile") libFooOfVariant := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static_orderfile")
libBarOfVariant := result.ModuleForTests("libBar", "android_arm64_armv8-a_static_orderfile") libBarOfVariant := result.ModuleForTests("libBar", "android_arm64_armv8-a_static_orderfile")
cFlags = libFooOfVariant.Rule("cc").Args["cFlags"] cFlags = libFooOfVariant.Rule("cc").Args["cFlags"]
if !strings.Contains(cFlags, expectedCFlag) { if !strings.Contains(cFlags, expectedCFlag) {
@ -216,8 +216,8 @@ func TestOrderfileProfilePropagateStaticDeps(t *testing.T) {
} }
// Check cFlags of the non-orderfile variant static libraries // Check cFlags of the non-orderfile variant static libraries
libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static") libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static")
libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static") libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static")
cFlags = libFoo.Rule("cc").Args["cFlags"] cFlags = libFoo.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, expectedCFlag) { if strings.Contains(cFlags, expectedCFlag) {
@ -281,8 +281,8 @@ func TestOrderfileLoadPropagateStaticDeps(t *testing.T) {
t.Errorf("Expected 'libTest' to load orderfile, but did not find %q in ldFlags %q", expectedCFlag, ldFlags) t.Errorf("Expected 'libTest' to load orderfile, but did not find %q in ldFlags %q", expectedCFlag, ldFlags)
} }
libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static") libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static")
libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static") libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static")
// Check dependency edge from orderfile-enabled module to non-orderfile variant static libraries // Check dependency edge from orderfile-enabled module to non-orderfile variant static libraries
if !hasDirectDep(result, libTest.Module(), libFoo.Module()) { if !hasDirectDep(result, libTest.Module(), libFoo.Module()) {
@ -351,8 +351,8 @@ func TestOrderfileProfilePropagateSharedDeps(t *testing.T) {
} }
// Check cFlags of the static and shared libraries // Check cFlags of the static and shared libraries
libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_shared") libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_shared")
libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static") libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static")
cFlags = libFoo.Rule("cc").Args["cFlags"] cFlags = libFoo.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, expectedCFlag) { if strings.Contains(cFlags, expectedCFlag) {
@ -431,8 +431,8 @@ func TestOrderfileProfileStaticLibrary(t *testing.T) {
} }
// Check cFlags of the static libraries // Check cFlags of the static libraries
libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static") libFoo := result.ModuleForTests("libFoo", "android_arm64_armv8-a_static")
libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static") libBar := result.ModuleForTests("libBar", "android_arm64_armv8-a_static")
cFlags = libFoo.Rule("cc").Args["cFlags"] cFlags = libFoo.Rule("cc").Args["cFlags"]
if strings.Contains(cFlags, expectedCFlag) { if strings.Contains(cFlags, expectedCFlag) {
@ -467,4 +467,4 @@ func TestOrderfileProfileStaticLibrary(t *testing.T) {
t.Errorf("Expected variants for 'libBar' to not contain 'orderfile', but found %q", v) t.Errorf("Expected variants for 'libBar' to not contain 'orderfile', but found %q", v)
} }
} }
} }

2
java/bootclasspath_fragment.go
View file

@ -782,7 +782,7 @@ func (b *BootclasspathFragmentModule) produceBootImageProfileFromSource(ctx andr
dexLocations := make([]string, 0, len(contents)) dexLocations := make([]string, 0, len(contents))
for _, module := range contents { for _, module := range contents {
dexPaths = append(dexPaths, modules[module.Name()]) dexPaths = append(dexPaths, modules[module.Name()])
dexLocations = append(dexLocations, filepath.Join("/", "apex", apex, "javalib", module.Name() + ".jar")) dexLocations = append(dexLocations, filepath.Join("/", "apex", apex, "javalib", module.Name()+".jar"))
} }
// Build a profile for the modules in this fragment. // Build a profile for the modules in this fragment.

6
java/dexpreopt_bootjars.go
View file

@ -628,7 +628,7 @@ func generateBootImage(ctx android.ModuleContext, imageConfig *bootImageConfig)
} }
type apexJarModulePair struct { type apexJarModulePair struct {
apex string apex string
jarModule android.Module jarModule android.Module
} }
@ -640,7 +640,7 @@ func getModulesForImage(ctx android.ModuleContext, imageConfig *bootImageConfig)
name := android.RemoveOptionalPrebuiltPrefix(module.Name()) name := android.RemoveOptionalPrebuiltPrefix(module.Name())
if name == imageConfig.modules.Jar(i) { if name == imageConfig.modules.Jar(i) {
modules = append(modules, apexJarModulePair{ modules = append(modules, apexJarModulePair{
apex: imageConfig.modules.Apex(i), apex: imageConfig.modules.Apex(i),
jarModule: module, jarModule: module,
}) })
found = true found = true
@ -1178,7 +1178,7 @@ func dumpOatRules(ctx android.ModuleContext, image *bootImageConfig) {
Rule: android.Phony, Rule: android.Phony,
Output: phony, Output: phony,
Inputs: allPhonies, Inputs: allPhonies,
Description: "dump-oat-"+name, Description: "dump-oat-" + name,
}) })
} }

4
java/dexpreopt_config.go
View file

@ -278,7 +278,7 @@ func getDexpreoptDirName(ctx android.PathContext) string {
prefix := "dexpreopt_" prefix := "dexpreopt_"
targets := ctx.Config().Targets[android.Android] targets := ctx.Config().Targets[android.Android]
if len(targets) > 0 { if len(targets) > 0 {
return prefix+targets[0].Arch.ArchType.String() return prefix + targets[0].Arch.ArchType.String()
} }
return prefix+"unknown_target" return prefix + "unknown_target"
} }

2
java/dexpreopt_config_testing.go
View file

@ -77,7 +77,7 @@ var ApexBootJarDexJarPaths = []string{
func PrepareApexBootJarModule(apexName string, moduleName string) android.FixturePreparer { func PrepareApexBootJarModule(apexName string, moduleName string) android.FixturePreparer {
moduleSourceDir := fmt.Sprintf("packages/modules/%s", apexName) moduleSourceDir := fmt.Sprintf("packages/modules/%s", apexName)
fragmentName := apexName+"-bootclasspath-fragment" fragmentName := apexName + "-bootclasspath-fragment"
imageNameProp := "" imageNameProp := ""
if apexName == "com.android.art" { if apexName == "com.android.art" {
fragmentName = "art-bootclasspath-fragment" fragmentName = "art-bootclasspath-fragment"

2
ui/build/config.go
View file

@ -1348,7 +1348,7 @@ func (c *configImpl) rbeProxyLogsDir() string {
} }
func (c *configImpl) rbeDownloadTmpDir() string { func (c *configImpl) rbeDownloadTmpDir() string {
for _, f := range []string{"RBE_download_tmp_dir", "FLAG_download_tmp_dir"} { for _, f := range []string{"RBE_download_tmp_dir", "FLAG_download_tmp_dir"} {
if v, ok := c.environ.Get(f); ok { if v, ok := c.environ.Get(f); ok {
return v return v
} }