From 23655b59050e3217702d43ba9f517893ba544542 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 18 Oct 2023 17:59:22 +0100 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I3fb9a925261b97d05815b4cdb9d45adf72301856 --- Android.bp | 6 ++---- cargo2android.json | 4 ---- cargo_embargo.json | 3 +++ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index fd96792..776a794 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 { @@ -32,9 +32,7 @@ rust_library { "num-traits", "std", ], - rustlibs: [ - "libnum_traits", - ], + rustlibs: ["libnum_traits"], proc_macros: ["libmerge_derive"], apex_available: [ "//apex_available:platform", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6e26a5a..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "device": true, - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..cb908d7 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,3 @@ +{ + "run_cargo": false +} -- cgit v1.2.3