aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 16:30:53 +0100
committerAndrew Walbran <qwandor@google.com>2023-10-18 16:30:53 +0100
commit35acf1dc8fe3a562ec062f521507b63498fa83f7 (patch)
tree327ae0a399bfd7fd1d79e65c2cc13913f41bde9a
parent0af4d0879e8ac61e3889e05f8396dcda27b741b7 (diff)
downloadanes-35acf1dc8fe3a562ec062f521507b63498fa83f7.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: If8e7f3ddb523ddc1b0d9ddcc5a7b2923c5496f85
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json10
3 files changed, 12 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index 36ba6ab..387051e 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.
-
-
package {
default_applicable_licenses: ["external_rust_crates_anes_license"],
}
@@ -100,9 +98,7 @@ rust_library {
"bitflags",
"parser",
],
- rustlibs: [
- "libbitflags-1.3.2",
- ],
+ rustlibs: ["libbitflags-1.3.2"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index eac39f0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "device": true,
- "run": true,
- "features": "parser",
- "tests": true,
- "dep-suffixes": {
- "bitflags": "-1.3.2"
- }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..71c6d2d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+ "tests": true,
+ "features": [
+ "parser"
+ ],
+ "module_name_overrides": {
+ "libbitflags": "libbitflags-1.3.2"
+ },
+ "run_cargo": false
+}