Snap for 11186783 from a15185e48b98c6e0d4f2f681e7b9f613e1adefb0 to 24Q1-release
Change-Id: Iea1aab0151b59b92d4777d6841e327dbd5166d1a
diff --git a/1.3.2/Android.bp b/1.3.2/Android.bp
index 713e014..fa12685 100644
--- a/1.3.2/Android.bp
+++ b/1.3.2/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -65,7 +65,7 @@
rust_test {
name: "bitflags_test_tests_basic-1.3.2",
host_supported: true,
- crate_name: "bitflags",
+ crate_name: "basic",
cargo_env_compat: true,
cargo_pkg_version: "1.3.2",
srcs: ["tests/basic.rs"],
diff --git a/1.3.2/Cargo.toml b/1.3.2/Cargo.toml
index 9d54c72..59ad06b 100644
--- a/1.3.2/Cargo.toml
+++ b/1.3.2/Cargo.toml
@@ -39,6 +39,7 @@
[dev-dependencies.serde]
version = "1.0"
+features = ["serde_derive"]
[dev-dependencies.serde_derive]
version = "1.0"
diff --git a/1.3.2/cargo2android.json b/1.3.2/cargo2android.json
deleted file mode 100644
index 37a404a..0000000
--- a/1.3.2/cargo2android.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "dependency-blocklist": [
- "trybuild"
- ],
- "device": true,
- "min-sdk-version": "29",
- "run": true,
- "test-blocklist": [
- "tests/compile.rs"
- ],
- "tests": true,
- "vendor-available": true,
- "name-suffix": "-1.3.2",
- "dep-suffixes": {
- "bitflags": "-1.3.2"
- }
-}
diff --git a/1.3.2/cargo_embargo.json b/1.3.2/cargo_embargo.json
new file mode 100644
index 0000000..3a41536
--- /dev/null
+++ b/1.3.2/cargo_embargo.json
@@ -0,0 +1,20 @@
+{
+ "min_sdk_version": "29",
+ "module_blocklist": [
+ "bitflags_test_tests_compile"
+ ],
+ "module_name_overrides": {
+ "bitflags_test_src_lib": "bitflags_test_src_lib-1.3.2",
+ "bitflags_test_tests_basic": "bitflags_test_tests_basic-1.3.2",
+ "libbitflags": "libbitflags-1.3.2"
+ },
+ "package": {
+ "bitflags": {
+ "dep_blocklist": [
+ "libtrybuild"
+ ]
+ }
+ },
+ "run_cargo": false,
+ "tests": true
+}
diff --git a/1.3.2/patches/Cargo.toml.patch b/1.3.2/patches/Cargo.toml.patch
new file mode 100644
index 0000000..f50886a
--- /dev/null
+++ b/1.3.2/patches/Cargo.toml.patch
@@ -0,0 +1,12 @@
+diff --git a/1.3.2/Cargo.toml b/1.3.2/Cargo.toml
+index 9d54c72..59ad06b 100644
+--- a/1.3.2/Cargo.toml
++++ b/1.3.2/Cargo.toml
+@@ -39,6 +39,7 @@ version = "1.0"
+
+ [dev-dependencies.serde]
+ version = "1.0"
++features = ["serde_derive"]
+
+ [dev-dependencies.serde_derive]
+ version = "1.0"
