diff options
| -rw-r--r-- | android/androidmk.go | 2 | ||||
| -rw-r--r-- | rust/androidmk.go | 10 | ||||
| -rw-r--r-- | rust/compiler.go | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index 951e03c36..7d6b05673 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -64,7 +64,6 @@ type AndroidMkDataProvider interface { type AndroidMkData struct { Class string SubName string - DistFiles TaggedDistFiles OutputFile OptionalPath Disabled bool Include string @@ -1093,7 +1092,6 @@ func (data *AndroidMkData) fillInData(ctx fillInEntriesContext, mod blueprint.Mo data.Entries = AndroidMkEntries{ Class: data.Class, SubName: data.SubName, - DistFiles: data.DistFiles, OutputFile: data.OutputFile, Disabled: data.Disabled, Include: data.Include, diff --git a/rust/androidmk.go b/rust/androidmk.go index 8de6b6004..98946844d 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -92,9 +92,6 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkEntries) { ctx.SubAndroidMk(ret, binary.baseCompiler) - if binary.distFile.Valid() { - ret.DistFiles = android.MakeDefaultDistFiles(binary.distFile.Path()) - } ret.Class = "EXECUTABLES" } @@ -143,9 +140,6 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An } else if library.shared() { ret.Class = "SHARED_LIBRARIES" } - if library.distFile.Valid() { - ret.DistFiles = android.MakeDefaultDistFiles(library.distFile.Path()) - } ret.ExtraEntries = append(ret.ExtraEntries, func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { if library.tocFile.Valid() { @@ -158,10 +152,6 @@ func (procMacro *procMacroDecorator) AndroidMk(ctx AndroidMkContext, ret *androi ctx.SubAndroidMk(ret, procMacro.baseCompiler) ret.Class = "PROC_MACRO_LIBRARIES" - if procMacro.distFile.Valid() { - ret.DistFiles = android.MakeDefaultDistFiles(procMacro.distFile.Path()) - } - } func (sourceProvider *BaseSourceProvider) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkEntries) { diff --git a/rust/compiler.go b/rust/compiler.go index f186ef38f..c3bc937da 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -257,8 +257,6 @@ type baseCompiler struct { location installLocation sanitize *sanitize - distFile android.OptionalPath - installDeps android.InstallPaths // unstripped output file. |