StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add imports_compile_dex to prebuilt_apis

Browse Source 
Allows specifying compile_dex for java_import modules generated by
prebuilt_apis.

Bug: 160455085
Test: m sdk_public_current_android
Change-Id: Id316ba740577b2c9c0522368c01072864cda6cca
This commit is contained in:
Liz Kammer
2020-09-02 08:37:49 -07:00
parent 3652018b83
commit 4e7f2607ed
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/prebuilt_apis.go
View File

@@ -38,6 +38,9 @@ type prebuiltApisProperties struct {
// The sdk_version of java_import modules generated based on jar files. // The sdk_version of java_import modules generated based on jar files.
// Defaults to "current" // Defaults to "current"
Imports_sdk_version *string Imports_sdk_version *string
// If set to true, compile dex for java_import modules. Defaults to false.
Imports_compile_dex *bool
} }
type prebuiltApis struct { type prebuiltApis struct {
@@ -78,17 +81,19 @@ func prebuiltApiModuleName(mctx android.LoadHookContext, module string, scope st
return mctx.ModuleName() + "_" + scope + "_" + apiver + "_" + module return mctx.ModuleName() + "_" + scope + "_" + apiver + "_" + module
} }
func createImport(mctx android.LoadHookContext, module, scope, apiver, path, sdk_version string) { func createImport(mctx android.LoadHookContext, module, scope, apiver, path, sdkVersion string, compileDex bool) {
props := struct { props := struct {
Name *string Name *string
Jars []string Jars []string
Sdk_version *string Sdk_version *string
Installable *bool Installable *bool
Compile_dex *bool
}{} }{}
props.Name = proptools.StringPtr(prebuiltApiModuleName(mctx, module, scope, apiver)) props.Name = proptools.StringPtr(prebuiltApiModuleName(mctx, module, scope, apiver))
props.Jars = append(props.Jars, path) props.Jars = append(props.Jars, path)
props.Sdk_version = proptools.StringPtr(sdk_version) props.Sdk_version = proptools.StringPtr(sdkVersion)
props.Installable = proptools.BoolPtr(false) props.Installable = proptools.BoolPtr(false)
props.Compile_dex = proptools.BoolPtr(compileDex)
mctx.CreateModule(ImportFactory, &props) mctx.CreateModule(ImportFactory, &props)
} }
@@ -124,13 +129,14 @@ func prebuiltSdkStubs(mctx android.LoadHookContext, p *prebuiltApis) {
// <apiver>/<scope>/<module>.jar // <apiver>/<scope>/<module>.jar
files := getPrebuiltFiles(mctx, p, "*.jar") files := getPrebuiltFiles(mctx, p, "*.jar")
sdk_version := proptools.StringDefault(p.properties.Imports_sdk_version, "current") sdkVersion := proptools.StringDefault(p.properties.Imports_sdk_version, "current")
compileDex := proptools.BoolDefault(p.properties.Imports_compile_dex, false)
for _, f := range files { for _, f := range files {
// create a Import module for each jar file // create a Import module for each jar file
localPath := strings.TrimPrefix(f, mydir) localPath := strings.TrimPrefix(f, mydir)
module, apiver, scope := parseJarPath(localPath) module, apiver, scope := parseJarPath(localPath)
createImport(mctx, module, scope, apiver, localPath, sdk_version) createImport(mctx, module, scope, apiver, localPath, sdkVersion, compileDex)
} }
} }