Follow changes to java_library
All java_library modules now default to not installable, and can
be made installable with installable: true.
Test: m checkbuild
Change-Id: I69201b94bff9537ce9c731d911d32ac0b2b50e95
diff --git a/build/hidl_interface.go b/build/hidl_interface.go
index 375c656..dd85e6f 100644
--- a/build/hidl_interface.go
+++ b/build/hidl_interface.go
@@ -288,11 +288,12 @@
Out: concat(wrap(name.sanitizedDir()+"I", interfaces, ".java"),
wrap(name.sanitizedDir(), i.properties.Types, ".java")),
})
- mctx.CreateModule(android.ModuleFactoryAdaptor(java.LibraryFactory(true)), &javaProperties{
+ mctx.CreateModule(android.ModuleFactoryAdaptor(java.LibraryFactory), &javaProperties{
Name: proptools.StringPtr(name.javaName()),
Owner: i.properties.Owner,
Defaults: []string{"hidl-java-module-defaults"},
No_framework_libs: proptools.BoolPtr(true),
+ Installable: proptools.BoolPtr(true),
Srcs: []string{":" + name.javaSourcesName()},
Static_libs: javaDependencies,
@@ -315,11 +316,12 @@
Srcs: i.properties.Srcs,
Out: []string{name.sanitizedDir() + "Constants.java"},
})
- mctx.CreateModule(android.ModuleFactoryAdaptor(java.LibraryFactory(true)), &javaProperties{
+ mctx.CreateModule(android.ModuleFactoryAdaptor(java.LibraryFactory), &javaProperties{
Name: proptools.StringPtr(name.javaConstantsName()),
Owner: i.properties.Owner,
Defaults: []string{"hidl-java-module-defaults"},
No_framework_libs: proptools.BoolPtr(true),
+ Installable: proptools.BoolPtr(true),
Srcs: []string{":" + name.javaConstantsSourcesName()},
})
}
@@ -435,7 +437,7 @@
return nil
}
-var doubleLoadablePackageNames = []string {
+var doubleLoadablePackageNames = []string{
"android.hardware.configstore@",
"android.hardware.graphics.allocator@",
"android.hardware.graphics.bufferqueue@",