Snap for 11084970 from cd697bd26753d723d5365948982081e643f305a6 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Iba88a894f86db99390f886980085b650568ee62a

3 files changed, 6 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index f63d309..10d0606 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_protobuf-support_license",
@@ -36,9 +34,7 @@ rust_library {
     cargo_pkg_version: "3.2.0",
     srcs: ["src/lib.rs"],
     edition: "2021",
-    rustlibs: [
-        "libthiserror",
-    ],
+    rustlibs: ["libthiserror"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 26ba70d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "//apex_available:anyapex"
-  ],
-  "min-sdk-version": "29",
-  "dependencies": true,
-  "device": true,
-  "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..a6d8815
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+  "min_sdk_version": "29",
+  "run_cargo": false
+}