Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e6b932b authored by Alan Viverette's avatar Alan Viverette Committed by Automerger Merge Worker
Browse files

Merge "Patch "Add support for --optional-uses-libs to pom2bp" to match master" am: b89663b7 

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

Change-Id: Id546d60af089384ec93eb5952dbfba076300c877
parents dc2cc0d8 b89663b7

cmd/pom2bp/pom2bp.go

+2 −6
Original line number Diff line number Diff line
@@ -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}}