Merge changes I21c1e459,I9e908ac2 into main
* changes:
rules.mk: Don't depend on spin in Trusty userland
Revert^2 "rules.mk: Enable spin feature for no_std use case"
diff --git a/Android.bp b/Android.bp
index f78d41a..9a648cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
// This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
package {
default_applicable_licenses: ["external_rust_crates_lazy_static_license"],
@@ -43,7 +45,7 @@
crate_name: "test",
cargo_env_compat: true,
cargo_pkg_version: "1.4.0",
- srcs: ["tests/test.rs"],
+ crate_root: "tests/test.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -59,7 +61,7 @@
crate_name: "lazy_static",
cargo_env_compat: true,
cargo_pkg_version: "1.4.0",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
edition: "2015",
apex_available: [
"//apex_available:platform",
@@ -75,7 +77,7 @@
crate_name: "lazy_static",
cargo_env_compat: true,
cargo_pkg_version: "1.4.0",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
edition: "2015",
features: [
"spin",
