diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-29 22:16:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-29 22:16:51 +0000 |
commit | 81859a2c6f9afdc49f58c9e02f9d92b0d0ad6a4f (patch) | |
tree | 631e4922731e297477dba699be89bee8be2db78a | |
parent | cea827557441ed7006edd52ad47aa2d168ade83a (diff) | |
parent | d488ec7a64c8490c36eb159d2fb870def34b403a (diff) | |
download | unicode-bidi-81859a2c6f9afdc49f58c9e02f9d92b0d0ad6a4f.tar.gz |
Merge "Migrate to cargo_embargo." into main am: f7fd39458c am: d488ec7a64
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-bidi/+/2852587
Change-Id: Ie9edb70c756795c11348bf211e08ae30612791ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | cargo_embargo.json | 9 |
3 files changed, 11 insertions, 17 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"], } 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 +} |