Snap for 11180250 from 4babe0e0abd2e4bc34b348699becc3920ac4413c 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: Ifb9e138f505a8b9995548e4c95c31d162b6c8a64

4 files changed, 91 insertions, 91 deletions

diff --git a/Android.bp b/Android.bp
index bd5d9043..277146a0 100644
--- a/Android.bp
+++ b/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 {
@@ -39,7 +39,11 @@ rust_library {
     host_supported: true,
     crate_name: "grpcio_sys",
     cargo_env_compat: true,
-    srcs: ["src/lib.rs", ":libgrpc_bindgen"],
+    cargo_pkg_version: "0.12.1+1.46.5-patched",
+    srcs: [
+        "src/lib.rs",
+        ":libgrpc_bindgen",
+    ],
     edition: "2018",
     features: [
         "_gen-bindings",
@@ -61,9 +65,9 @@ rust_library {
     min_sdk_version: "29",
     shared_libs: [
         "libgrpc++",
-        "libgrpc_wrap"
-    ]
-    ,
+        "libgrpc_wrap",
+    ],
+
 }
 
 cc_defaults {
@@ -128,4 +132,3 @@ rust_test {
     clippy_lints: "none",
     lints: "none",
 }
-
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 9b5eaefa..00000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices"
-  ],
-  "device": true,
-  "features": "boringssl,_gen-bindings",
-  "min-sdk-version": "29",
-  "no-pkg-vers": true,
-  "patch": "patches/Android.bp.patch",
-  "run": true,
-  "vendor-available": true,
-  "product-available": false,
-  "lib-blocklist": [
-        "absl_bad_optional_access",
-        "absl_bad_variant_access",
-        "absl_base",
-        "absl_city",
-        "absl_civil_time",
-        "absl_cord",
-        "absl_debugging_internal",
-        "absl_demangle_internal",
-        "absl_exponential_biased",
-        "absl_graphcycles_internal",
-        "absl_hash",
-        "absl_hashtablez_sampler",
-        "absl_int128",
-        "absl_log_severity",
-        "absl_malloc_internal",
-        "absl_raw_hash_set",
-        "absl_raw_logging_internal",
-        "absl_spinlock_wait",
-        "absl_stacktrace",
-        "absl_status",
-        "absl_statusor",
-        "absl_str_format_internal",
-        "absl_strings",
-        "absl_strings_internal",
-        "absl_symbolize",
-        "absl_synchronization",
-        "absl_throw_delegate",
-        "absl_time",
-        "absl_time_zone",
-        "absl_wyhash",
-        "absl_cord_internal",
-        "absl_cordz_functions",
-        "absl_cordz_handle",
-        "absl_cordz_info",
-        "absl_low_level_hash",
-        "absl_random_distributions",
-        "absl_random_internal_platform",
-        "absl_random_internal_pool_urbg",
-        "absl_random_internal_randen",
-        "absl_random_internal_randen_hwaes",
-        "absl_random_internal_randen_hwaes_impl",
-        "absl_random_internal_randen_slow",
-        "absl_random_internal_seed_material",
-        "absl_random_seed_gen_exception",
-        "absl_random_seed_sequences",
-        "address_sorting",
-        "cares",
-        "crypto",
-        "gpr",
-        "grpc",
-        "grpc_wrap",
-        "re2",
-        "ssl",
-        "stdc++",
-        "upb",
-        "z"
-  ],
-  "add-toplevel-block": "cargo2android-extra-module.bp",
-  "add-module-block": "cargo2android_module.bp"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 00000000..777bea33
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,79 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices"
+  ],
+  "extra_cfg": ["soong"],
+  "features": [
+    "boringssl",
+    "_gen-bindings"
+  ],
+  "min_sdk_version": "29",
+  "package": {
+    "grpcio-sys": {
+      "add_module_block": "cargo2android_module.bp",
+      "add_toplevel_block": "cargo2android-extra-module.bp",
+      "dep_blocklist": [
+        "libabsl_bad_optional_access",
+        "libabsl_bad_variant_access",
+        "libabsl_base",
+        "libabsl_city",
+        "libabsl_civil_time",
+        "libabsl_cord",
+        "libabsl_debugging_internal",
+        "libabsl_demangle_internal",
+        "libabsl_exponential_biased",
+        "libabsl_graphcycles_internal",
+        "libabsl_hash",
+        "libabsl_hashtablez_sampler",
+        "libabsl_int128",
+        "libabsl_log_severity",
+        "libabsl_malloc_internal",
+        "libabsl_raw_hash_set",
+        "libabsl_raw_logging_internal",
+        "libabsl_spinlock_wait",
+        "libabsl_stacktrace",
+        "libabsl_status",
+        "libabsl_statusor",
+        "libabsl_str_format_internal",
+        "libabsl_strings",
+        "libabsl_strings_internal",
+        "libabsl_symbolize",
+        "libabsl_synchronization",
+        "libabsl_throw_delegate",
+        "libabsl_time",
+        "libabsl_time_zone",
+        "libabsl_wyhash",
+        "libabsl_cord_internal",
+        "libabsl_cordz_functions",
+        "libabsl_cordz_handle",
+        "libabsl_cordz_info",
+        "libabsl_low_level_hash",
+        "libabsl_random_distributions",
+        "libabsl_random_internal_platform",
+        "libabsl_random_internal_pool_urbg",
+        "libabsl_random_internal_randen",
+        "libabsl_random_internal_randen_hwaes",
+        "libabsl_random_internal_randen_hwaes_impl",
+        "libabsl_random_internal_randen_slow",
+        "libabsl_random_internal_seed_material",
+        "libabsl_random_seed_gen_exception",
+        "libabsl_random_seed_sequences",
+        "libaddress_sorting",
+        "libcares",
+        "libcrypto",
+        "libgpr",
+        "libgrpc",
+        "libgrpc_wrap",
+        "libre2",
+        "libssl",
+        "libstdc++",
+        "libupb",
+        "libz"
+      ],
+      "patch": "patches/Android.bp.patch"
+    }
+  },
+  "product_available": false,
+  "run_cargo": false
+}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index baf35eb7..5555d4c0 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,21 +1,13 @@
 diff --git a/Android.bp b/Android.bp
-index 4bcdbd5..bd5d904 100644
+index eb98772..ae4702d 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -39,7 +39,7 @@ rust_library {
-     host_supported: true,
+@@ -40,7 +40,7 @@ rust_library {
      crate_name: "grpcio_sys",
      cargo_env_compat: true,
+     cargo_pkg_version: "0.12.1+1.46.5-patched",
 -    srcs: ["src/lib.rs"],
 +    srcs: ["src/lib.rs", ":libgrpc_bindgen"],
      edition: "2018",
      features: [
          "_gen-bindings",
-@@ -48,6 +48,7 @@ rust_library {
-         "boringssl",
-         "boringssl-src",
-     ],
-+    cfgs: ["soong"],
-     rustlibs: [
-         "liblibc",
-         "liblibz_sys",