From d143f3e35485b8ad9f5be0bede0f030874025240 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 24 Feb 2025 16:18:18 -0800 Subject: Remove DistFiles from AndroidMk datastructures The code that collects dists also supports getting them from OutputFiles. Switch the few remaining usages of AndroidMk-based disted files over to OutputFiles, and remove DistFiles from the AndroidMk datastructures. This should allow us to clean up more AndroidMk code in a followup cl. Bug: 398938465 Test: Confirmed that the ninja files for "m nothing dist" don't change after this cl. Change-Id: I9eaed21018ef73ec36276556e7daa7201b272009 --- android/androidmk_test.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'android/androidmk_test.go') diff --git a/android/androidmk_test.go b/android/androidmk_test.go index 0a81fb8bf..4cdd6a37b 100644 --- a/android/androidmk_test.go +++ b/android/androidmk_test.go @@ -34,7 +34,6 @@ type customModule struct { } data AndroidMkData - distFiles TaggedDistFiles outputFile OptionalPath } @@ -73,7 +72,6 @@ func (m *customModule) GenerateAndroidBuildActions(ctx ModuleContext) { path := PathForTesting("default-dist.out") defaultDistPaths = Paths{path} m.setOutputFiles(ctx, defaultDistPaths) - m.distFiles = MakeDefaultDistFiles(path) case defaultDistFiles_Tagged: // Module types that set AndroidMkEntry.DistFiles to the result of calling @@ -84,11 +82,6 @@ func (m *customModule) GenerateAndroidBuildActions(ctx ModuleContext) { // will be the same as empty-string-tag output. defaultDistPaths = PathsForTesting("one.out") m.setOutputFiles(ctx, defaultDistPaths) - - // This must be called after setting defaultDistPaths/outputFile as - // GenerateTaggedDistFiles calls into outputFiles property which may use - // those fields. - m.distFiles = m.GenerateTaggedDistFiles(ctx) } } @@ -113,7 +106,6 @@ func (m *customModule) AndroidMkEntries() []AndroidMkEntries { return []AndroidMkEntries{ { Class: "CUSTOM_MODULE", - DistFiles: m.distFiles, OutputFile: m.outputFile, }, } -- cgit v1.2.3-59-g8ed1b