diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-18 17:59:22 +0100 |
---|---|---|
committer | Andrew Walbran <qwandor@google.com> | 2023-10-18 17:59:22 +0100 |
commit | 23655b59050e3217702d43ba9f517893ba544542 (patch) | |
tree | 44f665f74d9c19ee7d0517b749edc8ddc1629970 | |
parent | b11dfab8e6d3a39a1151a912ae1db48bec849c3b (diff) | |
download | merge-23655b59050e3217702d43ba9f517893ba544542.tar.gz |
Migrate to cargo_embargo.
Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I3fb9a925261b97d05815b4cdb9d45adf72301856
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 4 | ||||
-rw-r--r-- | cargo_embargo.json | 3 |
3 files changed, 5 insertions, 8 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 { @@ -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 +} |