diff options
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | Cargo.toml | 5 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | cargo_embargo.json | 9 | ||||
-rw-r--r-- | patches/remove_missing_test.patch | 16 |
5 files changed, 27 insertions, 22 deletions
@@ -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 { @@ -40,7 +40,6 @@ license { rust_library { name: "libunicode_bidi", - // has rustc warnings host_supported: true, crate_name: "unicode_bidi", cargo_env_compat: true, @@ -63,7 +62,6 @@ rust_library { rust_test { name: "unicode-bidi_test_src_lib", - // has rustc warnings host_supported: true, crate_name: "unicode_bidi", cargo_env_compat: true, @@ -80,7 +78,5 @@ rust_test { "hardcoded-data", "std", ], - rustlibs: [ - "libserde_test", - ], + rustlibs: ["libserde_test"], } @@ -42,11 +42,6 @@ repository = "https://github.com/servo/unicode-bidi" [lib] name = "unicode_bidi" -[[test]] -name = "conformance_tests" -path = "tests/conformance_tests.rs" -required-features = ["hardcoded-data"] - [dependencies.flame] version = "0.2" optional = true diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 911c36f..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.resolv" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true, - "tests": true -}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..b8ed541 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,9 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "min_sdk_version": "29", + "run_cargo": false, + "tests": true +} diff --git a/patches/remove_missing_test.patch b/patches/remove_missing_test.patch new file mode 100644 index 0000000..5a69521 --- /dev/null +++ b/patches/remove_missing_test.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 02ea8fa..73aff86 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -42,11 +42,6 @@ repository = "https://github.com/servo/unicode-bidi" + [lib] + name = "unicode_bidi" + +-[[test]] +-name = "conformance_tests" +-path = "tests/conformance_tests.rs" +-required-features = ["hardcoded-data"] +- + [dependencies.flame] + version = "0.2" + optional = true |