Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bff8d799 authored Mar 22, 2023 by Jeff Vander Stoep

Use protobuf 2.x instead of 3.x

Ignore-AOSP-First: Will be merged into AOSP shortly after merging here.
    Merging here first as the topic includes fixes to internal-only
    projects.
Bug: 270895633
Test: build
Change-Id: I05c3b687e1db1a240d2a96b5f0005ba5d0934ce8

parent 90c1143c

system/gd/rust/facade/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ rust_library {
		"libbt_facade_proto",
		"libfutures",
		"libgrpcio",
		"libprotobuf",
		"libprotobuf_deprecated",
		"libtokio",
		"libgddi",
		"liblog_rust",
		@@ -74,7 +74,7 @@ rust_library {
		"libfutures",
		"libgrpcio",
		"libtokio",
		"libprotobuf",
		"libprotobuf_deprecated",
		"liblog_rust",
		"libcxx",
		],

system/gd/rust/stack/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ rust_library {
		"libgrpcio",
		"libtokio",
		"libtokio_stream",
		"libprotobuf",
		"libprotobuf_deprecated",
		"libbt_packets",
		"libgddi",
		"libcxx",
		@@ -71,7 +71,7 @@ rust_test_host {
		"libgrpcio",
		"libtokio",
		"libtokio_stream",
		"libprotobuf",
		"libprotobuf_deprecated",
		"libgddi",
		"libcxx",
		"liblazy_static",