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

Merge "Generate fake versions of modules excluded in directed vendor snapshot." am: c64b961708

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a3ad7ace5e1854d414afe130ba66b83158c63d2
This commit is contained in:
Jose "Pepe" Galmes
2021-02-05 18:28:41 +00:00
committed by Automerger Merge Worker
parent 3a0d57aed2 c64b961708
commit 504904f063
3 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cc/cc_test.go
View File

@@ -266,7 +266,7 @@ func checkVndkModule(t *testing.T, ctx *android.TestContext, name, subDir string
} }
} }
func checkSnapshotIncludeExclude(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string, include bool) { func checkSnapshotIncludeExclude(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string, include bool, fake bool) {
t.Helper() t.Helper()
mod, ok := ctx.ModuleForTests(moduleName, variant).Module().(android.OutputFileProducer) mod, ok := ctx.ModuleForTests(moduleName, variant).Module().(android.OutputFileProducer)
if !ok { if !ok {
@@ -282,9 +282,15 @@ func checkSnapshotIncludeExclude(t *testing.T, ctx *android.TestContext, singlet
if include { if include {
out := singleton.Output(snapshotPath) out := singleton.Output(snapshotPath)
if fake {
if out.Rule == nil {
t.Errorf("Missing rule for module %q output file %q", moduleName, outputFiles[0])
}
} else {
if out.Input.String() != outputFiles[0].String() { if out.Input.String() != outputFiles[0].String() {
t.Errorf("The input of snapshot %q must be %q, but %q", moduleName, out.Input.String(), outputFiles[0]) t.Errorf("The input of snapshot %q must be %q, but %q", moduleName, out.Input.String(), outputFiles[0])
} }
}
} else { } else {
out := singleton.MaybeOutput(snapshotPath) out := singleton.MaybeOutput(snapshotPath)
if out.Rule != nil { if out.Rule != nil {
@@ -294,11 +300,15 @@ func checkSnapshotIncludeExclude(t *testing.T, ctx *android.TestContext, singlet
} }
func checkSnapshot(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) { func checkSnapshot(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) {
checkSnapshotIncludeExclude(t, ctx, singleton, moduleName, snapshotFilename, subDir, variant, true) checkSnapshotIncludeExclude(t, ctx, singleton, moduleName, snapshotFilename, subDir, variant, true, false)
} }
func checkSnapshotExclude(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) { func checkSnapshotExclude(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) {
checkSnapshotIncludeExclude(t, ctx, singleton, moduleName, snapshotFilename, subDir, variant, false) checkSnapshotIncludeExclude(t, ctx, singleton, moduleName, snapshotFilename, subDir, variant, false, false)
}
func checkSnapshotRule(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) {
checkSnapshotIncludeExclude(t, ctx, singleton, moduleName, snapshotFilename, subDir, variant, true, true)
} }
func checkWriteFileOutput(t *testing.T, params android.TestingBuildParams, expected []string) { func checkWriteFileOutput(t *testing.T, params android.TestingBuildParams, expected []string) {

35
cc/vendor_snapshot.go
View File

@@ -239,10 +239,6 @@ func isSnapshotAware(cfg android.DeviceConfig, m *Module, inProprietaryPath bool
if _, ok := m.linker.(*llndkHeadersDecorator); ok { if _, ok := m.linker.(*llndkHeadersDecorator); ok {
return false return false
} }
// If we are using directed snapshot AND we have to exclude this module, skip this
if image.excludeFromDirectedSnapshot(cfg, m.BaseModuleName()) {
return false
}
// Libraries // Libraries
if l, ok := m.linker.(snapshotLibraryInterface); ok { if l, ok := m.linker.(snapshotLibraryInterface); ok {
@@ -371,18 +367,19 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
var headers android.Paths var headers android.Paths
copyFile := copyFileRule copyFile := func(ctx android.SingletonContext, path android.Path, out string, fake bool) android.OutputPath {
if c.fake { if fake {
// All prebuilt binaries and headers are installed by copyFile function. This makes a fake // All prebuilt binaries and headers are installed by copyFile function. This makes a fake
// snapshot just touch prebuilts and headers, rather than installing real files. // snapshot just touch prebuilts and headers, rather than installing real files.
copyFile = func(ctx android.SingletonContext, path android.Path, out string) android.OutputPath {
return writeStringToFileRule(ctx, "", out) return writeStringToFileRule(ctx, "", out)
} else {
return copyFileRule(ctx, path, out)
} }
} }
// installSnapshot function copies prebuilt file (.so, .a, or executable) and json flag file. // installSnapshot function copies prebuilt file (.so, .a, or executable) and json flag file.
// For executables, init_rc and vintf_fragments files are also copied. // For executables, init_rc and vintf_fragments files are also copied.
installSnapshot := func(m *Module) android.Paths { installSnapshot := func(m *Module, fake bool) android.Paths {
targetArch := "arch-" + m.Target().Arch.ArchType.String() targetArch := "arch-" + m.Target().Arch.ArchType.String()
if m.Target().Arch.ArchVariant != "" { if m.Target().Arch.ArchVariant != "" {
targetArch += "-" + m.Target().Arch.ArchVariant targetArch += "-" + m.Target().Arch.ArchVariant
@@ -419,7 +416,7 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
out := filepath.Join(configsDir, path.Base()) out := filepath.Join(configsDir, path.Base())
if !installedConfigs[out] { if !installedConfigs[out] {
installedConfigs[out] = true installedConfigs[out] = true
ret = append(ret, copyFile(ctx, path, out)) ret = append(ret, copyFile(ctx, path, out, fake))
} }
} }
@@ -470,7 +467,7 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
prop.ModuleName += ".cfi" prop.ModuleName += ".cfi"
} }
snapshotLibOut := filepath.Join(snapshotArchDir, targetArch, libType, stem) snapshotLibOut := filepath.Join(snapshotArchDir, targetArch, libType, stem)
ret = append(ret, copyFile(ctx, libPath, snapshotLibOut)) ret = append(ret, copyFile(ctx, libPath, snapshotLibOut, fake))
} else { } else {
stem = ctx.ModuleName(m) stem = ctx.ModuleName(m)
} }
@@ -484,7 +481,7 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
// install bin // install bin
binPath := m.outputFile.Path() binPath := m.outputFile.Path()
snapshotBinOut := filepath.Join(snapshotArchDir, targetArch, "binary", binPath.Base()) snapshotBinOut := filepath.Join(snapshotArchDir, targetArch, "binary", binPath.Base())
ret = append(ret, copyFile(ctx, binPath, snapshotBinOut)) ret = append(ret, copyFile(ctx, binPath, snapshotBinOut, fake))
propOut = snapshotBinOut + ".json" propOut = snapshotBinOut + ".json"
} else if m.object() { } else if m.object() {
// object files aren't installed to the device, so their names can conflict. // object files aren't installed to the device, so their names can conflict.
@@ -492,7 +489,7 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
objPath := m.outputFile.Path() objPath := m.outputFile.Path()
snapshotObjOut := filepath.Join(snapshotArchDir, targetArch, "object", snapshotObjOut := filepath.Join(snapshotArchDir, targetArch, "object",
ctx.ModuleName(m)+filepath.Ext(objPath.Base())) ctx.ModuleName(m)+filepath.Ext(objPath.Base()))
ret = append(ret, copyFile(ctx, objPath, snapshotObjOut)) ret = append(ret, copyFile(ctx, objPath, snapshotObjOut, fake))
propOut = snapshotObjOut + ".json" propOut = snapshotObjOut + ".json"
} else { } else {
ctx.Errorf("unknown module %q in vendor snapshot", m.String()) ctx.Errorf("unknown module %q in vendor snapshot", m.String())
@@ -532,9 +529,17 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
return return
} }
// installSnapshot installs prebuilts and json flag files // If we are using directed snapshot and a module is not included in the
snapshotOutputs = append(snapshotOutputs, installSnapshot(m)...) // list, we will still include the module as if it was a fake module.
// The reason is that soong needs all the dependencies to be present, even
// if they are not using during the build.
installAsFake := c.fake
if c.image.excludeFromDirectedSnapshot(ctx.DeviceConfig(), m.BaseModuleName()) {
installAsFake = true
}
// installSnapshot installs prebuilts and json flag files
snapshotOutputs = append(snapshotOutputs, installSnapshot(m, installAsFake)...)
// just gather headers and notice files here, because they are to be deduplicated // just gather headers and notice files here, because they are to be deduplicated
if l, ok := m.linker.(snapshotLibraryInterface); ok { if l, ok := m.linker.(snapshotLibraryInterface); ok {
headers = append(headers, l.snapshotHeaders()...) headers = append(headers, l.snapshotHeaders()...)
@@ -553,7 +558,7 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
// install all headers after removing duplicates // install all headers after removing duplicates
for _, header := range android.FirstUniquePaths(headers) { for _, header := range android.FirstUniquePaths(headers) {
snapshotOutputs = append(snapshotOutputs, copyFile(ctx, header, filepath.Join(includeDir, header.String()))) snapshotOutputs = append(snapshotOutputs, copyFile(ctx, header, filepath.Join(includeDir, header.String()), c.fake))
} }
// All artifacts are ready. Sort them to normalize ninja and then zip. // All artifacts are ready. Sort them to normalize ninja and then zip.

15
cc/vendor_snapshot_test.go
View File

@@ -228,7 +228,6 @@ func TestVendorSnapshotDirected(t *testing.T) {
snapshotSingleton := ctx.SingletonForTests("vendor-snapshot") snapshotSingleton := ctx.SingletonForTests("vendor-snapshot")
var includeJsonFiles []string var includeJsonFiles []string
var excludeJsonFiles []string
for _, arch := range [][]string{ for _, arch := range [][]string{
[]string{"arm64", "armv8-a"}, []string{"arm64", "armv8-a"},
@@ -248,9 +247,10 @@ func TestVendorSnapshotDirected(t *testing.T) {
checkSnapshot(t, ctx, snapshotSingleton, "prebuilt_libfoo", "libfoo.so", sharedDir, sharedVariant) checkSnapshot(t, ctx, snapshotSingleton, "prebuilt_libfoo", "libfoo.so", sharedDir, sharedVariant)
includeJsonFiles = append(includeJsonFiles, filepath.Join(sharedDir, "libfoo.so.json")) includeJsonFiles = append(includeJsonFiles, filepath.Join(sharedDir, "libfoo.so.json"))
// Excluded modules // Excluded modules. Modules not included in the directed vendor snapshot
checkSnapshotExclude(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.so", sharedDir, sharedVariant) // are still include as fake modules.
excludeJsonFiles = append(excludeJsonFiles, filepath.Join(sharedDir, "libvendor_available.so.json")) checkSnapshotRule(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.so", sharedDir, sharedVariant)
includeJsonFiles = append(includeJsonFiles, filepath.Join(sharedDir, "libvendor_available.so.json"))
} }
// Verify that each json file for an included module has a rule. // Verify that each json file for an included module has a rule.
@@ -259,13 +259,6 @@ func TestVendorSnapshotDirected(t *testing.T) {
t.Errorf("include json file %q not found", jsonFile) t.Errorf("include json file %q not found", jsonFile)
} }
} }
// Verify that each json file for an excluded module has no rule.
for _, jsonFile := range excludeJsonFiles {
if snapshotSingleton.MaybeOutput(jsonFile).Rule != nil {
t.Errorf("exclude json file %q found", jsonFile)
}
}
} }
func TestVendorSnapshotUse(t *testing.T) { func TestVendorSnapshotUse(t *testing.T) {