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

Merge "Revert^2 "Integrate Rust-specific System Properties into rules generation."" into main

Browse Source
This commit is contained in:
Andrew Walbran
2024-02-15 10:31:49 +00:00
committed by Gerrit Code Review
parent 90db03c007 ac0c87311d
commit e38e2c0071
4 changed files with 151 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sysprop/sysprop_test.go
View File

@@ -22,6 +22,7 @@ import (
"android/soong/android"
"android/soong/cc"
"android/soong/java"
"android/soong/rust"
"github.com/google/blueprint/proptools"
)
@@ -46,18 +47,6 @@ func test(t *testing.T, bp string) *android.TestResult {
recovery_available: true,
}
cc_library {
name: "liblog",
no_libcrt: true,
nocrt: true,
system_shared_libs: [],
recovery_available: true,
host_supported: true,
llndk: {
symbol_file: "liblog.map.txt",
}
}
java_library {
name: "sysprop-library-stub-platform",
sdk_version: "core_current",
@@ -74,6 +63,15 @@ func test(t *testing.T, bp string) *android.TestResult {
product_specific: true,
sdk_version: "core_current",
}
rust_library {
name: "librustutils",
crate_name: "rustutils",
srcs: ["librustutils/lib.rs"],
product_available: true,
vendor_available: true,
min_sdk_version: "29",
}
`
mockFS := android.MockFS{
@@ -115,11 +113,14 @@ func test(t *testing.T, bp string) *android.TestResult {
"android/sysprop/PlatformProperties.sysprop": nil,
"com/android/VendorProperties.sysprop": nil,
"com/android2/OdmProperties.sysprop": nil,
"librustutils/lib.rs": nil,
}
result := android.GroupFixturePreparers(
cc.PrepareForTestWithCcDefaultModules,
java.PrepareForTestWithJavaDefaultModules,
rust.PrepareForTestWithRustDefaultModules,
PrepareForTestWithSyspropBuildComponents,
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
variables.DeviceSystemSdkVersions = []string{"28"}
@@ -356,6 +357,10 @@ func TestApexAvailabilityIsForwarded(t *testing.T) {
javaModule := result.ModuleForTests("sysprop-platform", "android_common").Module().(*java.Library)
propFromJava := javaModule.ApexProperties.Apex_available
android.AssertDeepEquals(t, "apex_available forwarding to java module", expected, propFromJava)
rustModule := result.ModuleForTests("libsysprop_platform_rust", "android_arm64_armv8-a_rlib_rlib-std").Module().(*rust.Module)
propFromRust := rustModule.ApexProperties.Apex_available
android.AssertDeepEquals(t, "apex_available forwarding to rust module", expected, propFromRust)
}
func TestMinSdkVersionIsForwarded(t *testing.T) {
@@ -371,6 +376,9 @@ func TestMinSdkVersionIsForwarded(t *testing.T) {
java: {
min_sdk_version: "30",
},
rust: {
min_sdk_version: "29",
}
}
`)
@@ -381,4 +389,8 @@ func TestMinSdkVersionIsForwarded(t *testing.T) {
javaModule := result.ModuleForTests("sysprop-platform", "android_common").Module().(*java.Library)
propFromJava := javaModule.MinSdkVersionString()
android.AssertStringEquals(t, "min_sdk_version forwarding to java module", "30", propFromJava)
rustModule := result.ModuleForTests("libsysprop_platform_rust", "android_arm64_armv8-a_rlib_rlib-std").Module().(*rust.Module)
propFromRust := proptools.String(rustModule.Properties.Min_sdk_version)
android.AssertStringEquals(t, "min_sdk_version forwarding to rust module", "29", propFromRust)
}