tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "pom2bp: add apex_available/min_sdk_version"

Browse source
This commit is contained in:
Jooyung Han 2020-05-28 09:09:59 +00:00 committed by Gerrit Code Review
commit 9a37d4a602
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cmd/pom2bp/pom2bp.go
View file

@ -213,10 +213,14 @@ func (p Pom) IsHostAndDeviceModule() bool {
return hostAndDeviceModuleNames.IsHostAndDeviceModule(p.GroupId, p.ArtifactId) return hostAndDeviceModuleNames.IsHostAndDeviceModule(p.GroupId, p.ArtifactId)
} }
func (p Pom) IsHostOnly() bool {
return p.IsHostModule() && !p.IsHostAndDeviceModule()
}
func (p Pom) ModuleType() string { func (p Pom) ModuleType() string {
if p.IsAar() { if p.IsAar() {
return "android_library" return "android_library"
} else if p.IsHostModule() && !p.IsHostAndDeviceModule() { } else if p.IsHostOnly() {
return "java_library_host" return "java_library_host"
} else { } else {
return "java_library_static" return "java_library_static"
@ -226,7 +230,7 @@ func (p Pom) ModuleType() string {
func (p Pom) ImportModuleType() string { func (p Pom) ImportModuleType() string {
if p.IsAar() { if p.IsAar() {
return "android_library_import" return "android_library_import"
} else if p.IsHostModule() && !p.IsHostAndDeviceModule() { } else if p.IsHostOnly() {
return "java_import_host" return "java_import_host"
} else { } else {
return "java_import" return "java_import"
@ -366,6 +370,12 @@ var bpTemplate = template.Must(template.New("bp").Parse(`
{{- if .IsHostAndDeviceModule}} {{- if .IsHostAndDeviceModule}}
host_supported: true, host_supported: true,
{{- end}} {{- end}}
{{- if not .IsHostOnly}}
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
{{- end}}
{{- if .IsAar}} {{- if .IsAar}}
min_sdk_version: "{{.MinSdkVersion}}", min_sdk_version: "{{.MinSdkVersion}}",
static_libs: [ static_libs: [
@ -401,6 +411,12 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
{{- if .IsHostAndDeviceModule}} {{- if .IsHostAndDeviceModule}}
host_supported: true, host_supported: true,
{{- end}} {{- end}}
{{- if not .IsHostOnly}}
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
{{- end}}
{{- if .IsAar}} {{- if .IsAar}}
min_sdk_version: "{{.MinSdkVersion}}", min_sdk_version: "{{.MinSdkVersion}}",
static_libs: [ static_libs: [
@ -431,9 +447,17 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
{{- if .IsHostAndDeviceModule}} {{- if .IsHostAndDeviceModule}}
host_supported: true, host_supported: true,
{{- end}} {{- end}}
{{- if not .IsHostOnly}}
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
{{- end}}
{{- if .IsAar}} {{- if .IsAar}}
min_sdk_version: "{{.MinSdkVersion}}", min_sdk_version: "{{.MinSdkVersion}}",
manifest: "manifests/{{.BpName}}/AndroidManifest.xml", manifest: "manifests/{{.BpName}}/AndroidManifest.xml",
{{- else if not .IsHostOnly}}
min_sdk_version: "24",
{{- end}} {{- end}}
{{- end}} {{- end}}
static_libs: [ static_libs: [