commit b69575b1f697edae9f9b78765d50c8117d21f7d1
author Nan Zhang <nanzhang@google.com> Thu Aug 30 15:28:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 30 15:28:46 2018 +0000
tree ae920ffcea361b58a44022897a2dc7a3b443c112
parent 8a9900a75f091aa57d303e6483eb2c873b68b13a
parent 4c819fb59064921c2ef71fe1da489b5e3051d0d2

Merge "Add jetifier support in Soong."

cmd/pom2bp/pom2bp.go

diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go
index a39642f..a66a424 100644
--- a/cmd/pom2bp/pom2bp.go
+++ b/cmd/pom2bp/pom2bp.go
@@ -107,7 +107,7 @@
 type HostModuleNames map[string]bool
 
 func (n HostModuleNames) IsHostModule(groupId string, artifactId string) bool {
-	_, found := n[groupId + ":" + artifactId]
+	_, found := n[groupId+":"+artifactId]
 	return found
 }
 
@@ -293,7 +293,7 @@
 }
 
 var bpTemplate = template.Must(template.New("bp").Parse(`
-{{if .IsAar}}android_library_import{{else}}java_import{{end}} {
+{{if .IsAar}}android_library_import{{else if .IsDeviceModule}}java_import{{else}}java_import_host{{end}} {
     name: "{{.BpName}}-nodeps",
     {{if .IsAar}}aars{{else}}jars{{end}}: ["{{.ArtifactFile}}"],
     sdk_version: "{{.SdkVersion}}",{{if .IsAar}}
@@ -304,7 +304,7 @@
     ],{{end}}
 }
 
-{{if .IsAar}}android_library{{else}}{{if .IsDeviceModule}}java_library_static{{else}}java_library_host{{end}}{{end}} {
+{{if .IsAar}}android_library{{else if .IsDeviceModule}}java_library_static{{else}}java_library_host{{end}} {
     name: "{{.BpName}}",{{if .IsDeviceModule}}
     sdk_version: "{{.SdkVersion}}",{{if .IsAar}}
     min_sdk_version: "{{.MinSdkVersion}}",

java/android_manifest.go

diff --git a/java/android_manifest.go b/java/android_manifest.go
index 77b6214..6577475 100644
--- a/java/android_manifest.go
+++ b/java/android_manifest.go
@@ -68,7 +68,7 @@
 			Implicits: staticLibManifests,
 			Output:    mergedManifest,
 			Args: map[string]string{
-				"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--uses-library "),
+				"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "),
 			},
 		})
 		manifest = mergedManifest

java/droiddoc.go

diff --git a/java/droiddoc.go b/java/droiddoc.go
index 070d5c1..e4c9e38 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -1098,7 +1098,7 @@
 			"apiFileToCheck":        d.apiFile.String(),
 			"removedApiFile":        removedApiFile.String(),
 			"removedApiFileToCheck": d.removedApiFile.String(),
-			"msg": msg,
+			"msg":                   msg,
 		},
 	})
 }

ui/build/paths/config.go

diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 610af17..d6adc66 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -135,6 +135,7 @@
 	"true":      Allowed,
 	"uname":     Allowed,
 	"uniq":      Allowed,
+	"unix2dos":  Allowed,
 	"unzip":     Allowed,
 	"wc":        Allowed,
 	"which":     Allowed,