From 1e940d5b449148105e33d75cbef4bbde307bf1f9 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Fri, 29 Apr 2022 14:21:25 +0100
Subject: [PATCH] java_sdk_library_import: Delegate OutputFiles to impl library
 if needed

Bug: 230846030
Test: m nothing
      # Cherry pick into build with prebuilts enabled to verify.
Change-Id: I5ac9b1cdd2fc61efbc988e84556202ff6cd57146
---
 java/sdk_library.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/sdk_library.go b/java/sdk_library.go
index fb032559e..2c67767bf 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -2224,7 +2224,15 @@ func (module *SdkLibraryImport) UniqueApexVariations() bool {
 }
 
 func (module *SdkLibraryImport) OutputFiles(tag string) (android.Paths, error) {
-	return module.commonOutputFiles(tag)
+	paths, err := module.commonOutputFiles(tag)
+	if paths != nil || err != nil {
+		return paths, err
+	}
+	if module.implLibraryModule != nil {
+		return module.implLibraryModule.OutputFiles(tag)
+	} else {
+		return nil, nil
+	}
 }
 
 func (module *SdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {