From 68786d81deae3419359cbebdfea23d9fc724637c Mon Sep 17 00:00:00 2001 From: mrziwang Date: Tue, 9 Jul 2024 10:41:55 -0700 Subject: 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 --- java/app_import.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'java/app_import.go') diff --git a/java/app_import.go b/java/app_import.go index dc8470da7..fa87997cf 100644 --- a/java/app_import.go +++ b/java/app_import.go @@ -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 } -- cgit v1.2.3-59-g8ed1b