Revert^3 "Integrate Rust-specific System Properties into rules generation."
This reverts commit ac0c87311d6671cf442120ff56e24c40418de441.
Reason for revert: breaking the same bug, b/323833345 as before
Change-Id: I474c032148f22c4b98f7adf23be61807fa0500a0
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go
index e6464a7..80b86e0 100644
--- a/sysprop/sysprop_test.go
+++ b/sysprop/sysprop_test.go
@@ -22,7 +22,6 @@
"android/soong/android"
"android/soong/cc"
"android/soong/java"
- "android/soong/rust"
"github.com/google/blueprint/proptools"
)
@@ -46,6 +45,18 @@
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",
@@ -62,15 +73,6 @@
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{
@@ -112,14 +114,11 @@
"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"}
@@ -343,10 +342,6 @@
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) {
@@ -362,9 +357,6 @@
java: {
min_sdk_version: "30",
},
- rust: {
- min_sdk_version: "29",
- }
}
`)
@@ -375,8 +367,4 @@
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)
}