Revert "Generate app profiles even if dexpreopt is disabled."
Revert submission 2574032
Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_riscv64_minidroid-userdebug&lkgb=10069333&lkbb=10075041&fkbb=10071083>, bug <b/280902279>
Reverted changes: /q/submissionid:2574032
Change-Id: Ia9d05f3b7439604eb4a4b4100f46879fe11f5820
BUG: <280902279>
diff --git a/android/testing.go b/android/testing.go
index 2a9c658..fc39a9c 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -813,20 +813,6 @@
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
@@ -968,7 +954,12 @@
func (b baseTestingComponent) allOutputs() []string {
var outputFullPaths []string
for _, p := range b.provider.BuildParamsForTests() {
- outputFullPaths = append(outputFullPaths, allOutputs(p)...)
+ 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()...)
}
return outputFullPaths
}