commit e3f4b162c66b1a594b0aaae001d19da002f33bd9
author Ivan Lozano <ivanlozano@google.com> Wed Mar 22 20:27:21 2023 -0400
committer Jeff Vander Stoep <jeffv@google.com> Wed Mar 29 19:55:49 2023 +0200
tree 948b67e04fd06334530726a1c160064784178f60
parent cceead7b3e97dde3b9776b4753cb5dedba9a69fa

Use protobuf 2.x instead of 3.x

Ignore-AOSP-First: This will go into AOSP, but needs to be submitted
here because the topic includes internal changes.
Bug: 270895633
Test: build

Change-Id: I3a2fcd73b6d34c4314cc81de25601d9b67e73f70

authfs/Android.bp

diff --git a/authfs/Android.bp b/authfs/Android.bp
index 154a1d6..2532026 100644
--- a/authfs/Android.bp
+++ b/authfs/Android.bp
@@ -23,7 +23,7 @@
         "liblog_rust",
         "libnix",
         "libopenssl",
-        "libprotobuf",
+        "libprotobuf_deprecated",
         "librpcbinder_rs",
         "libthiserror",
     ],

compos/Android.bp

diff --git a/compos/Android.bp b/compos/Android.bp
index 2f6be98..c120b0f 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -18,7 +18,7 @@
         "libminijail_rust",
         "libnix",
         "libodsign_proto_rust",
-        "libprotobuf",
+        "libprotobuf_deprecated",
         "libregex",
         "librpcbinder_rs",
         "librustutils",

compos/composd/Android.bp

diff --git a/compos/composd/Android.bp b/compos/composd/Android.bp
index b0294dd..f66de32 100644
--- a/compos/composd/Android.bp
+++ b/compos/composd/Android.bp
@@ -22,7 +22,7 @@
         "liblibc",
         "liblog_rust",
         "libodsign_proto_rust",
-        "libprotobuf",
+        "libprotobuf_deprecated",
         "librustutils",
         "libshared_child",
         "libvmclient",

microdroid/payload/metadata/Android.bp

diff --git a/microdroid/payload/metadata/Android.bp b/microdroid/payload/metadata/Android.bp
index cd182fc..e3138e8 100644
--- a/microdroid/payload/metadata/Android.bp
+++ b/microdroid/payload/metadata/Android.bp
@@ -12,7 +12,7 @@
     rustlibs: [
         "libanyhow",
         "libmicrodroid_metadata_proto_rust",
-        "libprotobuf",
+        "libprotobuf_deprecated",
     ],
     apex_available: [
         "com.android.virt",