Revert "rust: Only allow bindgen to produce `rlib`s."
This reverts commit 53a452d1ff172fba9060f2997fec006a70e44c8d.
Reason for revert: Broken build
Change-Id: I4c1c6f2166c3729ef1916ad7c21e32599c5e692f
diff --git a/rust/bindgen.go b/rust/bindgen.go
index 0199d3a..72cc894 100644
--- a/rust/bindgen.go
+++ b/rust/bindgen.go
@@ -299,15 +299,7 @@
ClangProperties: cc.RustBindgenClangProperties{},
}
- 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)
- })
+ module := NewSourceProviderModule(hod, bindgen, false)
return module, bindgen
}
diff --git a/rust/protobuf.go b/rust/protobuf.go
index 88e80fe..9fe27c4c 100644
--- a/rust/protobuf.go
+++ b/rust/protobuf.go
@@ -238,7 +238,7 @@
Properties: ProtobufProperties{},
}
- module := NewSourceProviderModule(hod, protobuf, false, false)
+ module := NewSourceProviderModule(hod, protobuf, false)
return module, protobuf
}
diff --git a/rust/source_provider.go b/rust/source_provider.go
index 4f8d22b..7719611 100644
--- a/rust/source_provider.go
+++ b/rust/source_provider.go
@@ -65,12 +65,9 @@
}
}
-func NewSourceProviderModule(hod android.HostOrDeviceSupported, sourceProvider SourceProvider, enableLints bool, rlibOnly bool) *Module {
+func NewSourceProviderModule(hod android.HostOrDeviceSupported, sourceProvider SourceProvider, enableLints bool) *Module {
_, library := NewRustLibrary(hod)
library.BuildOnlyRust()
- if rlibOnly {
- library.BuildOnlyRlib()
- }
library.sourceProvider = sourceProvider
module := newModule(hod, android.MultilibBoth)