diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-17 18:27:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-17 18:27:45 +0000 |
| commit | 33ed12ea7b65745a49f4a905d28b61e3a3d93196 (patch) | |
| tree | 51e1e2a56037b1e941ba0a4be67ea12d1baba635 | |
| parent | b44002c17611f191b968a56590d4e92bc7603f48 (diff) | |
| parent | 1940676a27031f1af2632fa9d5fa833a0dee16af (diff) | |
| download | untrusted-33ed12ea7b65745a49f4a905d28b61e3a3d93196.tar.gz | |
Migrate to cargo_embargo. am: 61a44d920a am: 1940676a27
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/2836695
Change-Id: Ia84f5bc35cdc944eb2394cd3c0d6c5e816217acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | cargo_embargo.json (renamed from cargo2android.json) | 9 |
2 files changed, 5 insertions, 12 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 { @@ -20,7 +20,6 @@ license { rust_library { name: "libuntrusted", - // has rustc warnings host_supported: true, crate_name: "untrusted", cargo_env_compat: true, @@ -40,7 +39,6 @@ rust_library { rust_test { name: "untrusted_test_tests_tests", - // has rustc warnings host_supported: true, crate_name: "tests", cargo_env_compat: true, @@ -52,7 +50,5 @@ rust_test { unit_test: true, }, edition: "2018", - rustlibs: [ - "libuntrusted", - ], + rustlibs: ["libuntrusted"], } diff --git a/cargo2android.json b/cargo_embargo.json index 506d866..2718013 100644 --- a/cargo2android.json +++ b/cargo_embargo.json @@ -1,13 +1,10 @@ { - "apex-available": [ + "apex_available": [ "//apex_available:platform", "com.android.compos", "com.android.resolv", "com.android.virt" ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true, + "min_sdk_version": "29", "tests": true -}
\ No newline at end of file +} |