aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 14:56:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 14:56:54 +0000
commitfba37d6f1ce782a669c740c5068f1fe3f2e6f0d7 (patch)
tree8042e356a222bccce8de8ea3b56ac839459bdfb0
parentedbe923ff5457314dd9554cad76823f474f963f5 (diff)
parent6192ef513e4c559345b60c202f9c3a6b198d9280 (diff)
downloadconfig-fba37d6f1ce782a669c740c5068f1fe3f2e6f0d7.tar.gz
Migrate to cargo_embargo. am: 6192ef513e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/config/+/2822893 Change-Id: Idf1ac48de8a50c52d585b8e1b0e1fd160ba2ffe3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json16
3 files changed, 17 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index d42c800..91aa034 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_host {
name: "libconfig_rust",
crate_name: "config",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index aaeb2e6..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "features": "toml,json,yaml",
- "name-suffix": "_rust",
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..85ca64d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,16 @@
+{
+ "features": [
+ "toml",
+ "json",
+ "yaml"
+ ],
+ "module_name_overrides": {
+ "libconfig": "libconfig_rust"
+ },
+ "package": {
+ "config": {
+ "device_supported": false
+ }
+ },
+ "run_cargo": false
+}