Snap for 11227258 from 92cf73246222ee839e776932d6591adf5e81ec0a to 24Q2-release
Change-Id: I1a676862bfcaa479d61b0fcc07705c1ca267d85c
diff --git a/Android.bp b/Android.bp
index ac8429c..9629b9a 100644
--- a/Android.bp
+++ b/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 {
@@ -60,13 +60,18 @@
min_sdk_version: "29",
}
-rust_defaults {
- name: "url_test_defaults",
- crate_name: "url",
+rust_test {
+ name: "url_test_tests_data",
+ host_supported: true,
+ crate_name: "data",
cargo_env_compat: true,
cargo_pkg_version: "2.3.1",
+ srcs: ["tests/data.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: ["default"],
rustlibs: [
@@ -80,21 +85,25 @@
}
rust_test {
- name: "url_test_tests_data",
- defaults: ["url_test_defaults"],
- host_supported: true,
- srcs: ["tests/data.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
name: "url_test_tests_unit",
- defaults: ["url_test_defaults"],
host_supported: true,
+ crate_name: "unit",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.3.1",
srcs: ["tests/unit.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: ["default"],
+ rustlibs: [
+ "libbencher",
+ "libform_urlencoded",
+ "libidna",
+ "libpercent_encoding",
+ "libserde_json",
+ "liburl",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e1e5077..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "dependency-blocklist": [
- "debugger_test",
- "debugger_test_parser"
- ],
- "test-blocklist": [
- "tests/debugger_visualizer.rs"
- ],
- "apex-available": [
- "//apex_available:platform",
- "com.android.resolv"
- ],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..208f9e0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,19 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.resolv"
+ ],
+ "min_sdk_version": "29",
+ "module_blocklist": [
+ "url_test_tests_debugger_visualizer"
+ ],
+ "package": {
+ "url": {
+ "dep_blocklist": [
+ "libdebugger_test",
+ "libdebugger_test_parser"
+ ]
+ }
+ },
+ "tests": true
+}
