Rename java_prebuilt_library to java_import
And make it work like bazel's java_import, using a "jars" property
instead of "srcs", and allowing multiple jars to be listed.
Test: soong tests
Change-Id: Ida2ace6412bd77b4feb423646000a1401004e0ea
diff --git a/java/androidmk.go b/java/androidmk.go
index 9ccf856..92af0ed 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -15,17 +15,28 @@
package java
import (
+ "fmt"
+ "io"
+
"android/soong/android"
)
func (library *Library) AndroidMk() (ret android.AndroidMkData, err error) {
ret.Class = "JAVA_LIBRARIES"
ret.OutputFile = android.OptionalPathForPath(library.outputFile)
+ ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
+ fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := .jar")
+ return nil
+ })
return
}
-func (prebuilt *Prebuilt) AndroidMk() (ret android.AndroidMkData, err error) {
+func (prebuilt *Import) AndroidMk() (ret android.AndroidMkData, err error) {
ret.Class = "JAVA_LIBRARIES"
- ret.OutputFile = android.OptionalPathForPath(prebuilt.classpathFile)
+ ret.OutputFile = android.OptionalPathForPath(prebuilt.combinedClasspathFile)
+ ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
+ fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := .jar")
+ return nil
+ })
return
}