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

Commit 6d826263 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"... 

Merge "Patch "Add support for --optional-uses-libs to pom2bp" to match master" am: b89663b7 am: 4e6b932b am: 59da3f7d am: ab1b9954 am: ba8a0695

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

Change-Id: I932e76031b480d35e9d0a42c3b6b0058819aa4f7
parents bd9d9b09 ba8a0695

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}}
@@ -462,12 +463,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}}",
@@ -512,6 +507,7 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(` 
        "{{.}}",

        {{- end}}

    ],

    {{- end}}

    {{- if .BpOptionalUsesLibs}}

    optional_uses_libs: [

        {{- range .BpOptionalUsesLibs}}