openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pom2bp: use java_import_host for host modules 

am: 8a9900a75f

Change-Id: Icfd86bb9a2a1cee2340322c27d0ef5789e3f4912
This commit is contained in:
Colin Cross 2018-08-29 18:21:34 -07:00 committed by android-build-merger
parent f2bd7c359f 8a9900a75f
commit 75ade5c3c8
1 changed files with 2 additions and 2 deletions
Show Stats 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(`
{{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",
{{if .IsAar}}aars{{else}}jars{{end}}: ["{{.ArtifactFile}}"],
sdk_version: "{{.SdkVersion}}",{{if .IsAar}}
@ -304,7 +304,7 @@ var bpTemplate = template.Must(template.New("bp").Parse(`
],{{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}}
sdk_version: "{{.SdkVersion}}",{{if .IsAar}}
min_sdk_version: "{{.MinSdkVersion}}",