Generalize deapexer module to export any files
Previously, the deapexer module had to duplicate the java library
specific logic for constructing the path to the library's dex file in
the .apex file. That is not something that the deapexer needs to be
aware of, all it needs is a list of files that should be exported.
This change moves that logic into the prebuilt_apex/apex_set modules
and generalizes the deapexer module so that it can export any files
that are requested.
The deapexer module does still need to know which java modules need
access to exported files so it can add dependencies from them onto
itself. However, it does not need to know what the type of the module
is.
Bug: 186455808
Test: m nothing
m SOONG_CONFIG_art_module_source_build=false nothing
Change-Id: I71c6f0f761efe3b6d66d54273786e98cd545811c
diff --git a/apex/prebuilt.go b/apex/prebuilt.go
index 92694c9..9d632a9 100644
--- a/apex/prebuilt.go
+++ b/apex/prebuilt.go
@@ -16,6 +16,7 @@
import (
"fmt"
+ "path/filepath"
"strconv"
"strings"
@@ -57,10 +58,18 @@
}
type prebuiltCommonProperties struct {
- DeapexerProperties
SelectedApexProperties
ForceDisable bool `blueprint:"mutated"`
+
+ // List of java libraries that are embedded inside this prebuilt APEX bundle and for which this
+ // APEX bundle will create an APEX variant and provide dex implementation jars for use by
+ // dexpreopt and boot jars package check.
+ Exported_java_libs []string
+
+ // List of bootclasspath fragments inside this prebuilt APEX bundle and for which this APEX
+ // bundle will create an APEX variant.
+ Exported_bootclasspath_fragments []string
}
func (p *prebuiltCommon) Prebuilt() *android.Prebuilt {
@@ -411,15 +420,20 @@
}
// Compute the deapexer properties from the transitive dependencies of this module.
- deapexerProperties := &DeapexerProperties{}
+ javaModules := []string{}
+ exportedFiles := map[string]string{}
ctx.WalkDeps(func(child, parent android.Module) bool {
tag := ctx.OtherModuleDependencyTag(child)
name := android.RemoveOptionalPrebuiltPrefix(ctx.OtherModuleName(child))
if java.IsBootclasspathFragmentContentDepTag(tag) || tag == exportedJavaLibTag {
- deapexerProperties.Exported_java_libs = append(deapexerProperties.Exported_java_libs, name)
+ javaModules = append(javaModules, name)
+
+ // 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(...).
+ exportedFiles[name+"{.dexjar}"] = filepath.Join("javalib", name+".jar")
+
} else if tag == exportedBootclasspathFragmentTag {
- deapexerProperties.Exported_bootclasspath_fragments = append(deapexerProperties.Exported_bootclasspath_fragments, name)
// Only visit the children of the bootclasspath_fragment for now.
return true
}
@@ -427,9 +441,20 @@
return false
})
- // Remove any duplicates from the deapexer lists.
- deapexerProperties.Exported_bootclasspath_fragments = android.FirstUniqueStrings(deapexerProperties.Exported_bootclasspath_fragments)
- deapexerProperties.Exported_java_libs = android.FirstUniqueStrings(deapexerProperties.Exported_java_libs)
+ // Create properties for deapexer module.
+ deapexerProperties := &DeapexerProperties{
+ // Remove any duplicates from the java modules lists as a module may be included via a direct
+ // dependency as well as transitive ones.
+ CommonModules: android.SortedUniqueStrings(javaModules),
+ }
+
+ // Populate the exported files property in a fixed order.
+ for _, tag := range android.SortedStringKeys(exportedFiles) {
+ deapexerProperties.ExportedFiles = append(deapexerProperties.ExportedFiles, DeapexerExportedFile{
+ Tag: tag,
+ Path: exportedFiles[tag],
+ })
+ }
props := struct {
Name *string