diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:19 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:19 +0000 |
| commit | b7b9b4113b2b817a1b383ac5c6c878942ec4cf63 (patch) | |
| tree | 5c2031d402bcd576ef2598a43e612e83519553c1 | |
| parent | 5a1940aeba7e3e4015c4d45e14596bc9a43a62cc (diff) | |
| parent | 3f06ea56ae8ad37cfc09ff26bc1bf12a4feb9d72 (diff) | |
| download | grpcio-android14-mainline-permission-release.tar.gz | |
Snap for 10453563 from 3f06ea56ae8ad37cfc09ff26bc1bf12a4feb9d72 to mainline-permission-releaseaml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release
Change-Id: I406487ca7efa9c6eadb6f563049f54500749e1b2
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | cargo2android.json | 7 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 28 |
3 files changed, 36 insertions, 4 deletions
@@ -20,6 +20,7 @@ license { rust_library { name: "libgrpcio", + // has rustc warnings host_supported: true, crate_name: "grpcio", cargo_env_compat: true, @@ -36,11 +37,11 @@ rust_library { "liblibc", "liblog_rust", "libparking_lot", - "libprotobuf", + "libprotobuf_deprecated", ], apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], min_sdk_version: "29", } diff --git a/cargo2android.json b/cargo2android.json index 001bc3e..ef64aa5 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,10 +1,13 @@ { + "patch": "patches/Android.bp.patch", "apex-available": [ "//apex_available:platform", - "com.android.bluetooth" + "com.android.btservices" ], "device": true, "features": "protobuf,protobuf-codec", "min-sdk-version": "29", - "run": true + "run": true, + "vendor-available": false, + "product-available": false } diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..90bcf79 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,28 @@ +From 5b1146f2a218f689ff2a5a81999e1d861f148ff4 Mon Sep 17 00:00:00 2001 +From: Jeff Vander Stoep <jeffv@google.com> +Date: Wed, 22 Mar 2023 15:18:53 +0100 +Subject: [PATCH] Use version 2.x of protobuf crate + +Test: TH +Bug: 270895633 +Change-Id: I65b29fa910b87af2ae32b7b7818670ae9ace4f75 +--- + Android.bp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Android.bp b/Android.bp +index f2aa77d..674b27f 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -36,7 +36,7 @@ rust_library { + "liblibc", + "liblog_rust", + "libparking_lot", +- "libprotobuf", ++ "libprotobuf_deprecated", + ], + apex_available: [ + "//apex_available:platform", +-- +2.40.0.348.gf938b09366-goog + |