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

Commit 83e3790b authored Mar 30, 2023 by Jeffrey Vander Stoep Committed by Automerger Merge Worker Mar 30, 2023

Merge "Use protobuf 2.x instead of 3.x" into tm-qpr-dev-plus-aosp am: 76fcbfbb am: 48678581

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22324319

Change-Id: Ide08c59268bad265968826a08f9767a2781b4557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1064987f 48678581

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",