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/app.go b/java/app.go
index 8a221ef..ceb7791 100644
--- a/java/app.go
+++ b/java/app.go
@@ -231,18 +231,19 @@
aaptFlags = append(aaptFlags, android.JoinWithPrefix(resourceDirs.Strings(), "-S "))
ctx.VisitDirectDeps(func(module blueprint.Module) {
- var depFile android.OptionalPath
+ var depFiles android.Paths
if sdkDep, ok := module.(sdkDependency); ok {
- depFile = android.OptionalPathForPath(sdkDep.ClasspathFile())
+ depFiles = sdkDep.ClasspathFiles()
} else if javaDep, ok := module.(Dependency); ok {
if ctx.OtherModuleName(module) == "framework-res" {
- depFile = android.OptionalPathForPath(javaDep.(*AndroidApp).exportPackage)
+ depFiles = android.Paths{javaDep.(*AndroidApp).exportPackage}
}
}
- if depFile.Valid() {
- aaptFlags = append(aaptFlags, "-I "+depFile.String())
- aaptDeps = append(aaptDeps, depFile.Path())
+
+ for _, dep := range depFiles {
+ aaptFlags = append(aaptFlags, "-I "+dep.String())
}
+ aaptDeps = append(aaptDeps, depFiles...)
})
sdkVersion := a.deviceProperties.Sdk_version