Use OutputFilesProvider on Import, AARImport and AndroidAppImport

In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I51ccf59f97cb8a790642cb4463c479feaf18058a
This commit is contained in:
mrziwang
2024-07-09 10:41:55 -07:00
parent ad111586a7
commit 68786d81de
5 changed files with 24 additions and 51 deletions

View File

@@ -17,7 +17,6 @@ package java
// This file contains the module implementations for android_app_import and android_test_import.
import (
"fmt"
"reflect"
"strings"
@@ -422,6 +421,8 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
},
)
ctx.SetOutputFiles([]android.Path{a.outputFile}, "")
// TODO: androidmk converter jni libs
}
@@ -461,15 +462,6 @@ func (a *AndroidAppImport) OutputFile() android.Path {
return a.outputFile
}
func (a *AndroidAppImport) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
return []android.Path{a.outputFile}, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
}
func (a *AndroidAppImport) JacocoReportClassesFile() android.Path {
return nil
}