From fef5500a766d1f515ff19038e8e0e8f606e07287 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 17 Jun 2021 14:56:05 +0100 Subject: Remove javalib special case in createDeapexerModuleIfNeeded Removes the special case in createDeapexerModuleIfNeeded for handling java libraries and just get the Import and SdkLibraryImport module types to implement RequiredFilesFromPrebuiltApex instead. Bug: 177892522 Test: m nothing Change-Id: I5cc341b5b4168b8eb196f72273a00d498de6856f --- java/java.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 2bbb5b102..3b6c9c884 100644 --- a/java/java.go +++ b/java/java.go @@ -1426,6 +1426,24 @@ func (j *Import) ShouldSupportSdkVersion(ctx android.BaseModuleContext, return nil } +// requiredFilesFromPrebuiltApexForImport returns information about the files that a java_import or +// java_sdk_library_import with the specified base module name requires to be exported from a +// prebuilt_apex/apex_set. +func requiredFilesFromPrebuiltApexForImport(name string) map[string]string { + // Add the dex implementation jar to the set of exported files. The path here must match the + // path of the file in the APEX created by apexFileForJavaModule(...). + return map[string]string{ + name + "{.dexjar}": filepath.Join("javalib", name+".jar"), + } +} + +var _ android.RequiredFilesFromPrebuiltApex = (*Import)(nil) + +func (j *Import) RequiredFilesFromPrebuiltApex(ctx android.BaseModuleContext) map[string]string { + name := j.BaseModuleName() + return requiredFilesFromPrebuiltApexForImport(name) +} + // Add compile time check for interface implementation var _ android.IDEInfo = (*Import)(nil) var _ android.IDECustomizedModuleName = (*Import)(nil) -- cgit v1.2.3-59-g8ed1b