commit bcbfc5f53c626642bfc6b8b24e3b13f75f98476e
author Alan Viverette <alanv@google.com> Mon Sep 13 17:12:28 2021 +0000
committer Alan Viverette <alanv@google.com> Mon Sep 13 19:28:35 2021 +0000
tree dd02e2a0ecb7d40e158914ad6a4d13ac445d3a33
parent 24658d07f8ec45362bf6ea9a46692b74498c962c

Patch "Add support for --optional-uses-libs to pom2bp" to match master

Cherry pick that was originally submitted was not up-to-date.

Change-Id: Ia599ea294926666cddfd84f8c2a3e22e7e7c0434

cmd/pom2bp/pom2bp.go

diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go
index 5770a7f..fe567a9 100644
--- a/cmd/pom2bp/pom2bp.go
+++ b/cmd/pom2bp/pom2bp.go
@@ -406,6 +406,7 @@
         "{{.}}",
         {{- end}}
     ],
+    {{- end}}
     {{- if .BpOptionalUsesLibs}}
     optional_uses_libs: [
         {{- range .BpOptionalUsesLibs}}
@@ -455,12 +456,6 @@
         "{{.}}",
         {{- end}}
     ],
-    {{- if .BpOptionalUsesLibs}}
-    optional_uses_libs: [
-        {{- range .BpOptionalUsesLibs}}
-        "{{.}}",
-        {{- end}}
-    ],
     {{- end}}
     {{- else if not .IsHostOnly}}
     min_sdk_version: "{{.DefaultMinSdkVersion}}",
@@ -505,6 +500,7 @@
         "{{.}}",
         {{- end}}
     ],
+    {{- end}}
     {{- if .BpOptionalUsesLibs}}
     optional_uses_libs: [
         {{- range .BpOptionalUsesLibs}}