Snap for 11180250 from da59a6748d27ffc0824d0f4cf68d2a89ad2b55a3 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_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I3676d75b8baf0907a7d725a64b9465516dfc9fa2

3 files changed, 23 insertions, 30 deletions

diff --git a/2.27.1/Android.bp b/2.27.1/Android.bp
index 668cc98..35d072b 100644
--- a/2.27.1/Android.bp
+++ b/2.27.1/Android.bp
@@ -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 {
@@ -29,7 +29,6 @@ genrule {
 
 rust_library {
     name: "libprotobuf_deprecated",
-    // has rustc warnings
     host_supported: true,
     crate_name: "protobuf",
     cargo_env_compat: true,
@@ -40,9 +39,7 @@ rust_library {
     ],
     edition: "2018",
     features: ["bytes"],
-    rustlibs: [
-        "libbytes",
-    ],
+    rustlibs: ["libbytes"],
     apex_available: [
         "//apex_available:platform",
         "com.android.btservices",
diff --git a/2.27.1/cargo2android.json b/2.27.1/cargo2android.json
deleted file mode 100644
index 17fe98a..0000000
--- a/2.27.1/cargo2android.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "copy-out": true,
-  "dependencies": true,
-  "device": true,
-  "features": "bytes",
-  "variants": [
-    {
-      "suffix": ""
-    },
-    {
-      "suffix": "_with_serde",
-      "features": "with-serde",
-      "device": false
-    }
-  ],
-  "min-sdk-version": "29",
-  "run": true,
-  "name-suffix": "_deprecated"
-}
diff --git a/2.27.1/cargo_embargo.json b/2.27.1/cargo_embargo.json
new file mode 100644
index 0000000..1d2e6c8
--- /dev/null
+++ b/2.27.1/cargo_embargo.json
@@ -0,0 +1,21 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "features": [
+    "bytes"
+  ],
+  "min_sdk_version": "29",
+  "module_name_overrides": {
+    "copy_protobuf_build_out": "copy_protobuf_deprecated_build_out",
+    "libprotobuf": "libprotobuf_deprecated"
+  },
+  "package": {
+    "protobuf": {
+      "copy_out": true
+    }
+  }
+}