Snap for 11097608 from eee98e227a0a474148c55d04a8d7f02aa05b93ec to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r28android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ib67a16a9b44e4bc943219db071757ec353d6d477

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
+}