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

Merge changes I4e721b47,I1bf05ade

Browse Source 
* changes:
  Generate app profiles even if dexpreopt is disabled.
  Generate boot image profiles even if dexpreopt is disabled.
This commit is contained in:
Jiakai Zhang
2023-05-04 22:13:08 +00:00
committed by Gerrit Code Review
parent c0bdca9110 7b845e808f
commit dbfcf85c53
12 changed files with 109 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
android/testing.go
View File

@@ -813,6 +813,20 @@ func normalizePathRelativeToTop(path Path) Path {
return path.RelativeToTop()
}
func allOutputs(p BuildParams) []string {
outputs := append(WritablePaths(nil), p.Outputs...)
outputs = append(outputs, p.ImplicitOutputs...)
if p.Output != nil {
outputs = append(outputs, p.Output)
}
return outputs.Strings()
}
// AllOutputs returns all 'BuildParams.Output's and 'BuildParams.Outputs's in their full path string forms.
func (p TestingBuildParams) AllOutputs() []string {
return allOutputs(p.BuildParams)
}
// baseTestingComponent provides functionality common to both TestingModule and TestingSingleton.
type baseTestingComponent struct {
config Config
@@ -954,12 +968,7 @@ func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildPar
func (b baseTestingComponent) allOutputs() []string {
var outputFullPaths []string
for _, p := range b.provider.BuildParamsForTests() {
outputs := append(WritablePaths(nil), p.Outputs...)
outputs = append(outputs, p.ImplicitOutputs...)
if p.Output != nil {
outputs = append(outputs, p.Output)
}
outputFullPaths = append(outputFullPaths, outputs.Strings()...)
outputFullPaths = append(outputFullPaths, allOutputs(p)...)
}
return outputFullPaths
}