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

Snap for 7889170 from b7de10739f to sc-d2-release 

Change-Id: I597f7c9ffde77aef3651a5f87350fc1852da6035
This commit is contained in:
Android Build Coastguard Worker 2021-11-06 01:00:40 +00:00
parent 0b66a869be b7de10739f
commit 88e8c60e97
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rust/benchmark.go
View File

@ -101,6 +101,7 @@ func (benchmark *benchmarkDecorator) compilerFlags(ctx ModuleContext, flags Flag
func (benchmark *benchmarkDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps { func (benchmark *benchmarkDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps = benchmark.binaryDecorator.compilerDeps(ctx, deps) deps = benchmark.binaryDecorator.compilerDeps(ctx, deps)
deps.Rustlibs = append(deps.Rustlibs, "libtest")
deps.Rustlibs = append(deps.Rustlibs, "libcriterion") deps.Rustlibs = append(deps.Rustlibs, "libcriterion")
return deps return deps

1
rust/config/global.go
View File

@ -29,7 +29,6 @@ var (
DefaultEdition = "2018" DefaultEdition = "2018"
Stdlibs = []string{ Stdlibs = []string{
"libstd", "libstd",
"libtest",
} }
// Mapping between Soong internal arch types and std::env constants. // Mapping between Soong internal arch types and std::env constants.

8
rust/test.go
View File

@ -169,3 +169,11 @@ func RustTestHostFactory() android.Module {
func (test *testDecorator) stdLinkage(ctx *depsContext) RustLinkage { func (test *testDecorator) stdLinkage(ctx *depsContext) RustLinkage {
return RlibLinkage return RlibLinkage
} }
func (test *testDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps = test.binaryDecorator.compilerDeps(ctx, deps)
deps.Rustlibs = append(deps.Rustlibs, "libtest")
return deps
}

2
rust/testing.go
View File

@ -162,12 +162,10 @@ func GatherRequiredDepsForTest() string {
name: "libtest", name: "libtest",
crate_name: "test", crate_name: "test",
srcs: ["foo.rs"], srcs: ["foo.rs"],
no_stdlibs: true,
host_supported: true, host_supported: true,
vendor_available: true, vendor_available: true,
vendor_ramdisk_available: true, vendor_ramdisk_available: true,
native_coverage: false, native_coverage: false,
sysroot: true,
apex_available: ["//apex_available:platform", "//apex_available:anyapex"], apex_available: ["//apex_available:platform", "//apex_available:anyapex"],
min_sdk_version: "29", min_sdk_version: "29",
} }