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/android/prebuilt_test.go b/android/prebuilt_test.go
index 774a15c..9a1de9c 100644
--- a/android/prebuilt_test.go
+++ b/android/prebuilt_test.go
@@ -151,7 +151,7 @@
}
if p, ok := m.(*prebuiltModule); ok {
dependsOnPrebuiltModule = true
- if !p.Prebuilt().Properties.UsePrebuilt {
+ if !p.Prebuilt().properties.UsePrebuilt {
t.Errorf("dependency on prebuilt module not marked used")
}
}
@@ -180,12 +180,16 @@
type prebuiltModule struct {
ModuleBase
- prebuilt Prebuilt
+ prebuilt Prebuilt
+ properties struct {
+ Srcs []string
+ }
}
func newPrebuiltModule() Module {
m := &prebuiltModule{}
- m.AddProperties(&m.prebuilt.Properties)
+ m.AddProperties(&m.properties)
+ InitPrebuiltModule(m, &m.properties.Srcs)
InitAndroidModule(m)
return m
}