From c82d7835efe710efb7f65fa20ec60d0ba41ac919 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 16 Nov 2023 13:38:18 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I128b208c0117d13866a65c53ca86c6df35fecf6d --- Android.bp | 6 ++---- cargo2android.json | 10 ---------- cargo_embargo.json | 7 +++++++ 3 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index da9aca2..4a8b6c8 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 { @@ -51,9 +51,7 @@ rust_test { unit_test: true, }, edition: "2018", - rustlibs: [ - "libitoa", - ], + rustlibs: ["libitoa"], } rust_library { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index ac56e26..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "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..7f14879 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,7 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "tests": true +} -- cgit v1.2.3