StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "rust: Only allow bindgen to produce rlibs."" am: d13d15a9c0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2170067

Change-Id: I8ad271de87803942a99f899d90f36f8cbbb1e774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matthew Maurer
2022-08-01 22:41:40 +00:00
committed by Automerger Merge Worker
parent 968197389a d13d15a9c0
commit b0bb92726e
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/bindgen.go
View File

@@ -299,15 +299,7 @@ func NewRustBindgen(hod android.HostOrDeviceSupported) (*Module, *bindgenDecorat
ClangProperties: cc.RustBindgenClangProperties{}, ClangProperties: cc.RustBindgenClangProperties{},
} }
module := NewSourceProviderModule(hod, bindgen, false, true) module := NewSourceProviderModule(hod, bindgen, false)
android.AddLoadHook(module, func(ctx android.LoadHookContext) {
type stub_props struct {
Visibility []string
}
props := &stub_props{[]string{":__subpackages__"}}
ctx.PrependProperties(props)
})
return module, bindgen return module, bindgen
} }

2
rust/protobuf.go
View File

@@ -238,7 +238,7 @@ func NewRustProtobuf(hod android.HostOrDeviceSupported) (*Module, *protobufDecor
Properties: ProtobufProperties{}, Properties: ProtobufProperties{},
} }
module := NewSourceProviderModule(hod, protobuf, false, false) module := NewSourceProviderModule(hod, protobuf, false)
return module, protobuf return module, protobuf
} }

5
rust/source_provider.go
View File

@@ -65,12 +65,9 @@ func NewSourceProvider() *BaseSourceProvider {
} }
} }
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 := NewRustLibrary(hod)
library.BuildOnlyRust() library.BuildOnlyRust()
if rlibOnly {
library.BuildOnlyRlib()
}
library.sourceProvider = sourceProvider library.sourceProvider = sourceProvider
module := newModule(hod, android.MultilibBoth) module := newModule(hod, android.MultilibBoth)