From 251a0c3b9f5317069fe779ead900dfb765f8dcf3 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 29 Nov 2023 15:30:18 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I598685b1eb7f467e10051b2ad7e7f4d91a2a1f7a --- Android.bp | 8 ++------ cargo2android.json | 5 ----- cargo_embargo.json | 4 ++++ 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index a317bf5..62a7c18 100644 --- a/Android.bp +++ b/Android.bp @@ -1,8 +1,6 @@ -// 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. - - rust_library { name: "libutf8", host_supported: true, @@ -32,7 +30,5 @@ rust_test { unit_test: true, }, edition: "2015", - rustlibs: [ - "libutf8", - ], + rustlibs: ["libutf8"], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index aefb658..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "run": true, - "device": true, - "tests": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..c8842d1 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,4 @@ +{ + "run_cargo": false, + "tests": true +} -- cgit v1.2.3