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

Merge "Patch "Add support for --optional-uses-libs to pom2bp" to match master" am: b89663b7d9 am: 4e6b932bd4 am: 59da3f7dc9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1825712

Change-Id: Ic7dbb3cddd0137a7b65fb65824d48f5e08557506
This commit is contained in:
Alan Viverette
2021-09-14 15:40:27 +00:00
committed by Automerger Merge Worker
parent db72b4ea4b 59da3f7dc9
commit ab1b9954b3
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/pom2bp/pom2bp.go
View File

@@ -406,6 +406,7 @@ var bpTemplate = template.Must(template.New("bp").Parse(`
"{{.}}",
{{- end}}
],
{{- end}}
{{- if .BpOptionalUsesLibs}}
optional_uses_libs: [
{{- range .BpOptionalUsesLibs}}
@@ -455,12 +456,6 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
"{{.}}",
{{- end}}
],
{{- if .BpOptionalUsesLibs}}
optional_uses_libs: [
{{- range .BpOptionalUsesLibs}}
"{{.}}",
{{- end}}
],
{{- end}}
{{- else if not .IsHostOnly}}
min_sdk_version: "{{.DefaultMinSdkVersion}}",
@@ -505,6 +500,7 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
"{{.}}",
{{- end}}
],
{{- end}}
{{- if .BpOptionalUsesLibs}}
optional_uses_libs: [
{{- range .BpOptionalUsesLibs}}