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

Merge "gofmt soong" into main am: 14c1ed8d7d am: 2cc9eea91d am: f2d3e5b72b

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

Change-Id: Ibfff520b15692a58c911d6290f5674d74571d716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-10-19 05:27:04 +00:00
committed by Automerger Merge Worker
parent 5051596b11 f2d3e5b72b
commit b251515ac8
10 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/bootclasspath_fragment.go
View File

@@ -782,7 +782,7 @@ func (b *BootclasspathFragmentModule) produceBootImageProfileFromSource(ctx andr
dexLocations := make([]string, 0, len(contents))
for _, module := range contents {
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.

6
java/dexpreopt_bootjars.go
View File

@@ -628,7 +628,7 @@ func generateBootImage(ctx android.ModuleContext, imageConfig *bootImageConfig)
}
type apexJarModulePair struct {
apex string
apex string
jarModule android.Module
}
@@ -640,7 +640,7 @@ func getModulesForImage(ctx android.ModuleContext, imageConfig *bootImageConfig)
name := android.RemoveOptionalPrebuiltPrefix(module.Name())
if name == imageConfig.modules.Jar(i) {
modules = append(modules, apexJarModulePair{
apex: imageConfig.modules.Apex(i),
apex: imageConfig.modules.Apex(i),
jarModule: module,
})
found = true
@@ -1178,7 +1178,7 @@ func dumpOatRules(ctx android.ModuleContext, image *bootImageConfig) {
Rule: android.Phony,
Output: phony,
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_"
targets := ctx.Config().Targets[android.Android]
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 {
moduleSourceDir := fmt.Sprintf("packages/modules/%s", apexName)
fragmentName := apexName+"-bootclasspath-fragment"
fragmentName := apexName + "-bootclasspath-fragment"
imageNameProp := ""
if apexName == "com.android.art" {
fragmentName = "art-bootclasspath-fragment"