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

Commit 63ffb901 authored Jul 28, 2022 by Jeffrey Vander Stoep Committed by Automerger Merge Worker Jul 28, 2022

Merge "Temporarily use libclap_deprecated" am: 1dcf47b1

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

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

parents 387be9e8 1dcf47b1

system/gd/rust/facade/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ rust_binary {
	srcs: ["src/main.rs"],		srcs: ["src/main.rs"],
	edition: "2018",		edition: "2018",
	rustlibs: [		rustlibs: [
	"libclap",		"libclap_deprecated",
	"libbluetooth_with_facades",		"libbluetooth_with_facades",
	"libfutures",		"libfutures",
	"libgrpcio",		"libgrpcio",

system/gd/rust/topshim/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ rust_library_host_rlib {
	"libbluetooth_rs",		"libbluetooth_rs",
	"libbt_common",		"libbt_common",
	"libbt_facade_helpers",		"libbt_facade_helpers",
	"libclap",		"libclap_deprecated",
	"libcxx",		"libcxx",
	"libgrpcio",		"libgrpcio",
	"libtokio",		"libtokio",