openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Make source_stem required for Rust SourceProviders" am: d13b308960 

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

Change-Id: Ib5f8f63e06743dfd95ca2d2360e81e5eeed921e5
This commit is contained in:
Ivan Lozano 2020-08-05 19:48:14 +00:00 committed by Automerger Merge Worker
parent 66b577a9de d13b308960
commit 89d57368b9
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rust/Android.bp
View File

@ -34,6 +34,7 @@ bootstrap_go_package {
"library_test.go",
"project_json_test.go",
"rust_test.go",
"source_provider_test.go",
"test_test.go",
],
pluginFor: ["soong_build"],

13
rust/source_provider.go
View File

@ -19,9 +19,8 @@ import (
)
type SourceProviderProperties struct {
// name for the generated source file. Defaults to module name (e.g. moduleNameFoo.rs is produced by default).
// Importantly, the inherited "stem" property for this module sets the output filename for the generated library
// variants only
// filename for the generated source file (<source_stem>.rs). This field is required.
// The inherited "stem" property sets the output filename for the generated library variants only.
Source_stem *string `android:"arch_variant"`
// crate name, used for the library variant of this source provider. See additional details in rust_library.
@ -65,11 +64,11 @@ func NewSourceProvider() *baseSourceProvider {
}
func (sp *baseSourceProvider) getStem(ctx android.ModuleContext) string {
stem := ctx.ModuleName()
if String(sp.Properties.Source_stem) != "" {
stem = String(sp.Properties.Source_stem)
if String(sp.Properties.Source_stem) == "" {
ctx.PropertyErrorf("source_stem",
"source_stem property is undefined but required for rust_bindgen modules")
}
return stem
return String(sp.Properties.Source_stem)
}
func (sp *baseSourceProvider) sourceProviderDeps(ctx DepsContext, deps Deps) Deps {

31
rust/source_provider_test.go Normal file
View File

@ -0,0 +1,31 @@
// Copyright 2020 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package rust
import (
"testing"
)
var stemRequiredError = "source_stem property is undefined but required for rust_bindgen modules"
func TestSourceProviderRequiredFields(t *testing.T) {
testRustError(t, stemRequiredError, `
rust_bindgen {
name: "libbindgen",
wrapper_src: "src/any.h",
crate_name: "bindgen",
}
`)
}