Emit static dependencies into pom2mk-generated Makefile
Bug: 70516592
Test: ./update_current.py -s -t 4495436
Change-Id: Ic7dd433de78f9666c7388ed8ec1deebee7269368
diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go
index 33d7ff9..721e250 100644
--- a/cmd/pom2mk/pom2mk.go
+++ b/cmd/pom2mk/pom2mk.go
@@ -87,10 +87,13 @@
var sdkVersion string
var useVersion string
+var staticDeps bool
type Dependency struct {
XMLName xml.Name `xml:"dependency"`
+ MakeTarget string `xml:"-"`
+
GroupId string `xml:"groupId"`
ArtifactId string `xml:"artifactId"`
Version string `xml:"version"`
@@ -99,6 +102,13 @@
Scope string `xml:"scope"`
}
+func (d Dependency) MkName() string {
+ if d.MakeTarget == "" {
+ d.MakeTarget = rewriteNames.MavenToMk(d.GroupId, d.ArtifactId)
+ }
+ return d.MakeTarget
+}
+
type Pom struct {
XMLName xml.Name `xml:"http://maven.apache.org/POM/4.0.0 project"`
@@ -114,6 +124,14 @@
Dependencies []*Dependency `xml:"dependencies>dependency"`
}
+func (p Pom) IsAar() bool {
+ return p.Packaging == "aar"
+}
+
+func (p Pom) IsJar() bool {
+ return p.Packaging == "jar"
+}
+
func (p Pom) MkName() string {
if p.MakeTarget == "" {
p.MakeTarget = rewriteNames.MavenToMk(p.GroupId, p.ArtifactId)
@@ -121,10 +139,18 @@
return p.MakeTarget
}
-func (p Pom) MkDeps() []string {
+func (p Pom) MkJarDeps() []string {
+ return p.MkDeps("jar")
+}
+
+func (p Pom) MkAarDeps() []string {
+ return p.MkDeps("aar")
+}
+
+func (p Pom) MkDeps(typeExt string) []string {
var ret []string
for _, d := range p.Dependencies {
- if d.Type != "aar" {
+ if d.Type != typeExt {
continue
}
name := rewriteNames.MavenToMk(d.GroupId, d.ArtifactId)
@@ -143,7 +169,7 @@
if d.Type != "" {
continue
}
- if depPom, ok := modules[p.MkName()]; ok {
+ if depPom, ok := modules[d.MkName()]; ok {
d.Type = depPom.Packaging
}
}
@@ -160,11 +186,40 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := {{.SdkVersion}}
LOCAL_STATIC_ANDROID_LIBRARIES := \
-{{range .MkDeps}} {{.}} \
+{{range .MkAarDeps}} {{.}} \
{{end}}
include $(BUILD_PREBUILT)
`))
+var mkDepsTemplate = template.Must(template.New("mk").Parse(`
+include $(CLEAR_VARS)
+LOCAL_MODULE := {{.MkName}}-nodeps
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SRC_FILES := {{.ArtifactFile}}
+LOCAL_BUILT_MODULE_STEM := javalib.jar
+LOCAL_MODULE_SUFFIX := .{{.Packaging}}
+LOCAL_USE_AAPT2 := true
+LOCAL_SDK_VERSION := {{.SdkVersion}}
+LOCAL_STATIC_ANDROID_LIBRARIES :={{range .MkAarDeps}} \
+ {{.}}{{end}}
+include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := {{.MkName}}
+LOCAL_SDK_VERSION := {{.SdkVersion}}{{if .IsAar}}
+LOCAL_MANIFEST_FILE := manifests/{{.MkName}}/AndroidManifest.xml{{end}}
+LOCAL_STATIC_JAVA_LIBRARIES :={{if .IsJar}} \
+ {{.MkName}}-nodeps{{end}}{{range .MkJarDeps}} \
+ {{.}}{{end}}
+LOCAL_STATIC_ANDROID_LIBRARIES :={{if .IsAar}} \
+ {{.MkName}}-nodeps{{end}}{{range .MkAarDeps}} \
+ {{.}}{{end}}
+LOCAL_JAR_EXCLUDE_FILES := none
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+LOCAL_USE_AAPT2 := true
+include $(BUILD_STATIC_JAVA_LIBRARY)
+`))
+
func parse(filename string) (*Pom, error) {
data, err := ioutil.ReadFile(filename)
if err != nil {
@@ -215,6 +270,8 @@
-use-version <version>
If the maven directory contains multiple versions of artifacts and their pom files,
-use-version can be used to only write makefiles for a specific version of those artifacts.
+ -static-deps
+ Whether to statically include direct dependencies.
<dir>
The directory to search for *.pom files under.
@@ -226,6 +283,7 @@
flag.Var(&rewriteNames, "rewrite", "Regex(es) to rewrite artifact names")
flag.StringVar(&sdkVersion, "sdk-version", "", "What to write to LOCAL_SDK_VERSION")
flag.StringVar(&useVersion, "use-version", "", "Only read artifacts of a specific version")
+ flag.BoolVar(&staticDeps, "static-deps", false, "Statically include direct dependencies")
flag.Parse()
if flag.NArg() != 1 {
@@ -310,7 +368,12 @@
fmt.Println("LOCAL_PATH := $(call my-dir)")
for _, pom := range poms {
- err := mkTemplate.Execute(os.Stdout, pom)
+ var err error
+ if staticDeps {
+ err = mkDepsTemplate.Execute(os.Stdout, pom)
+ } else {
+ err = mkTemplate.Execute(os.Stdout, pom)
+ }
if err != nil {
fmt.Fprintln(os.Stderr, "Error writing", pom.PomFile, pom.MkName(), err)
os.Exit(1)