From 7b845e808f07a607a9ecf630eea00a334636f0c5 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 2 May 2023 14:35:47 +0100 Subject: Generate app profiles even if dexpreopt is disabled. Bug: 280440941 Test: - 1. Patch ag/22302622 to disable dexpreopt. 2. lunch aosp_cf_x86_64_phone-userdebug && m 3. See app profiles still generated. Test: - 1. Patch ag/20592051 to enable profile for service-art. 2. banchan com.android.art x86_64 && m 3. See the profile for service-art generated. Change-Id: I4e721b475b84a2f667bbccc030a8947078f26bb0 --- android/testing.go | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'android/testing.go') diff --git a/android/testing.go b/android/testing.go index fc39a9c7a..2a9c6584e 100644 --- a/android/testing.go +++ b/android/testing.go @@ -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 } -- cgit v1.2.3-59-g8ed1b