diff options
| author | Colin Cross <ccross@android.com> | 2018-07-10 13:45:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-07-10 13:46:58 -0700 |
| commit | 461ba49a0a47c5ab84b592420c2a3d4a3948ba61 (patch) | |
| tree | 6df38f28568b7846c41fcf4b7a287820f4ab91c9 | |
| parent | 73ea6a3cf104991216e27fe0f9e957fe62525bad (diff) | |
| download | build_soong-461ba49a0a47c5ab84b592420c2a3d4a3948ba61.tar.gz build_soong-461ba49a0a47c5ab84b592420c2a3d4a3948ba61.tar.bz2 build_soong-461ba49a0a47c5ab84b592420c2a3d4a3948ba61.zip | |
pom2bp: move misplaced {{end}}
manifest property should only be added to aar imports and not jar
imports.
Bug: 110848854
Test: cd prebuilts/sdk/current/support && pom2bp -regen Android.bp
Change-Id: Ifaab81582c87f0af4419f90c3928d0d5d52cec33
| -rw-r--r-- | cmd/pom2bp/pom2bp.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go index 7b06035d..9aa25f07 100644 --- a/cmd/pom2bp/pom2bp.go +++ b/cmd/pom2bp/pom2bp.go @@ -281,8 +281,8 @@ var bpTemplate = template.Must(template.New("bp").Parse(` {{if .IsAar}}android_library{{else}}java_library_static{{end}} { name: "{{.BpName}}", sdk_version: "{{.SdkVersion}}",{{if .IsAar}} - min_sdk_version: "{{.MinSdkVersion}}",{{end}} - manifest: "manifests/{{.BpName}}/AndroidManifest.xml", + min_sdk_version: "{{.MinSdkVersion}}", + manifest: "manifests/{{.BpName}}/AndroidManifest.xml",{{end}} static_libs: [ "{{.BpName}}-nodeps",{{range .BpJarDeps}} "{{.}}",{{end}}{{range .BpAarDeps}} |