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

pom2bp: use java_import_host for host modules

Browse Source 
java_library_host modules shouldn't depend on java_import modules.

Bug: 112707915
Test: (cd prebuilts/sdk/current/androidx && pom2bp -regen Android.bp)
Change-Id: Ia5ac353a696c9f51f1b50b334a327937ddcb47e7
This commit is contained in:
Colin Cross
2018-08-29 15:25:48 -07:00
parent 86bc9d4622
commit 8a9900a75f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/pom2bp/pom2bp.go
View File

@@ -293,7 +293,7 @@ func (p *Pom) ExtractMinSdkVersion() error {
} }
var bpTemplate = template.Must(template.New("bp").Parse(` var bpTemplate = template.Must(template.New("bp").Parse(`
{{if .IsAar}}android_library_import{{else}}java_import{{end}} { {{if .IsAar}}android_library_import{{else if .IsDeviceModule}}java_import{{else}}java_import_host{{end}} {
name: "{{.BpName}}-nodeps", name: "{{.BpName}}-nodeps",
{{if .IsAar}}aars{{else}}jars{{end}}: ["{{.ArtifactFile}}"], {{if .IsAar}}aars{{else}}jars{{end}}: ["{{.ArtifactFile}}"],
sdk_version: "{{.SdkVersion}}",{{if .IsAar}} sdk_version: "{{.SdkVersion}}",{{if .IsAar}}
@@ -304,7 +304,7 @@ var bpTemplate = template.Must(template.New("bp").Parse(`
],{{end}} ],{{end}}
} }
{{if .IsAar}}android_library{{else}}{{if .IsDeviceModule}}java_library_static{{else}}java_library_host{{end}}{{end}} { {{if .IsAar}}android_library{{else if .IsDeviceModule}}java_library_static{{else}}java_library_host{{end}} {
name: "{{.BpName}}",{{if .IsDeviceModule}} name: "{{.BpName}}",{{if .IsDeviceModule}}
sdk_version: "{{.SdkVersion}}",{{if .IsAar}} sdk_version: "{{.SdkVersion}}",{{if .IsAar}}
min_sdk_version: "{{.MinSdkVersion}}", min_sdk_version: "{{.MinSdkVersion}}",