diff options
| -rw-r--r-- | android/allowlists/allowlists.go | 8 | ||||
| -rw-r--r-- | rust/bindgen.go | 10 | ||||
| -rw-r--r-- | rust/protobuf.go | 2 | ||||
| -rw-r--r-- | rust/source_provider.go | 5 |
4 files changed, 22 insertions, 3 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index e606cb165..a5799a54e 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -215,6 +215,10 @@ var ( "system/libartpalette": Bp2BuildDefaultTrueRecursively, "system/libbase": Bp2BuildDefaultTrueRecursively, "system/libfmq": Bp2BuildDefaultTrue, + "system/libhidl/transport/base/1.0": Bp2BuildDefaultTrue, + "system/libhidl/transport/manager/1.0": Bp2BuildDefaultTrue, + "system/libhidl/transport/manager/1.1": Bp2BuildDefaultTrue, + "system/libhidl/transport/manager/1.2": Bp2BuildDefaultTrue, "system/libhwbinder": Bp2BuildDefaultTrueRecursively, "system/libprocinfo": Bp2BuildDefaultTrue, "system/libziparchive": Bp2BuildDefaultTrueRecursively, @@ -382,6 +386,10 @@ var ( "car-ui-androidx-core-common-nodeps", "car-ui-androidx-lifecycle-common-nodeps", "car-ui-androidx-constraintlayout-solver-nodeps", + + //system/libhidl + // needed by cc_hidl_library + "libhidlbase", } Bp2buildModuleTypeAlwaysConvertList = []string{ diff --git a/rust/bindgen.go b/rust/bindgen.go index 72cc894cc..0199d3a37 100644 --- a/rust/bindgen.go +++ b/rust/bindgen.go @@ -299,7 +299,15 @@ func NewRustBindgen(hod android.HostOrDeviceSupported) (*Module, *bindgenDecorat ClangProperties: cc.RustBindgenClangProperties{}, } - module := NewSourceProviderModule(hod, bindgen, false) + module := NewSourceProviderModule(hod, bindgen, false, true) + + android.AddLoadHook(module, func(ctx android.LoadHookContext) { + type stub_props struct { + Visibility []string + } + props := &stub_props{[]string{":__subpackages__"}} + ctx.PrependProperties(props) + }) return module, bindgen } diff --git a/rust/protobuf.go b/rust/protobuf.go index 9fe27c4c9..88e80fe35 100644 --- a/rust/protobuf.go +++ b/rust/protobuf.go @@ -238,7 +238,7 @@ func NewRustProtobuf(hod android.HostOrDeviceSupported) (*Module, *protobufDecor Properties: ProtobufProperties{}, } - module := NewSourceProviderModule(hod, protobuf, false) + module := NewSourceProviderModule(hod, protobuf, false, false) return module, protobuf } diff --git a/rust/source_provider.go b/rust/source_provider.go index 7719611d5..4f8d22b1f 100644 --- a/rust/source_provider.go +++ b/rust/source_provider.go @@ -65,9 +65,12 @@ func NewSourceProvider() *BaseSourceProvider { } } -func NewSourceProviderModule(hod android.HostOrDeviceSupported, sourceProvider SourceProvider, enableLints bool) *Module { +func NewSourceProviderModule(hod android.HostOrDeviceSupported, sourceProvider SourceProvider, enableLints bool, rlibOnly bool) *Module { _, library := NewRustLibrary(hod) library.BuildOnlyRust() + if rlibOnly { + library.BuildOnlyRlib() + } library.sourceProvider = sourceProvider module := newModule(hod, android.MultilibBoth) |