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

pom2bp: move misplaced {{end}}

Browse Source 
manifest property should only be added to aar imports and not jar
imports.

Bug: 110848854
Test: cd prebuilts/sdk/current/support && pom2bp -regen Android.bp
Change-Id: Ifaab81582c87f0af4419f90c3928d0d5d52cec33
This commit is contained in:
Colin Cross
2018-07-10 13:45:30 -07:00
parent 73ea6a3cf1
commit 461ba49a0a
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

@@ -281,8 +281,8 @@ var bpTemplate = template.Must(template.New("bp").Parse(`
{{if .IsAar}}android_library{{else}}java_library_static{{end}} { {{if .IsAar}}android_library{{else}}java_library_static{{end}} {
name: "{{.BpName}}", name: "{{.BpName}}",
sdk_version: "{{.SdkVersion}}",{{if .IsAar}} sdk_version: "{{.SdkVersion}}",{{if .IsAar}}
min_sdk_version: "{{.MinSdkVersion}}",{{end}} min_sdk_version: "{{.MinSdkVersion}}",
manifest: "manifests/{{.BpName}}/AndroidManifest.xml", manifest: "manifests/{{.BpName}}/AndroidManifest.xml",{{end}}
static_libs: [ static_libs: [
"{{.BpName}}-nodeps",{{range .BpJarDeps}} "{{.BpName}}-nodeps",{{range .BpJarDeps}}
"{{.}}",{{end}}{{range .BpAarDeps}} "{{.}}",{{end}}{{range .BpAarDeps}}