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

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

Change-Id: Id546d60af089384ec93eb5952dbfba076300c877
This commit is contained in:
Alan Viverette
2021-09-14 15:08:58 +00:00
committed by Automerger Merge Worker
parent dc2cc0d8d7 b89663b7d9
commit 4e6b932bd4
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}}
], ],
{{- end}}
{{- if .BpOptionalUsesLibs}} {{- if .BpOptionalUsesLibs}}
optional_uses_libs: [ optional_uses_libs: [
{{- range .BpOptionalUsesLibs}} {{- range .BpOptionalUsesLibs}}
@@ -455,12 +456,6 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
"{{.}}", "{{.}}",
{{- end}} {{- end}}
], ],
{{- if .BpOptionalUsesLibs}}
optional_uses_libs: [
{{- range .BpOptionalUsesLibs}}
"{{.}}",
{{- end}}
],
{{- end}} {{- end}}
{{- else if not .IsHostOnly}} {{- else if not .IsHostOnly}}
min_sdk_version: "{{.DefaultMinSdkVersion}}", min_sdk_version: "{{.DefaultMinSdkVersion}}",
@@ -505,6 +500,7 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(`
"{{.}}", "{{.}}",
{{- end}} {{- end}}
], ],
{{- end}}
{{- if .BpOptionalUsesLibs}} {{- if .BpOptionalUsesLibs}}
optional_uses_libs: [ optional_uses_libs: [
{{- range .BpOptionalUsesLibs}} {{- range .BpOptionalUsesLibs}}