From 437a88f109e885d069a20d5caacdc0c311be7290 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 17 Feb 2023 14:04:35 +0900 Subject: [PATCH] Drop unnecessary dependencies to libbinder_rpc_unstable Rust modules don't need to depend on the library because it's an implementation detail of the Rust crate librpcbinder_rs. Bug: N/A Test: m Change-Id: If2e1b98e2297b5a63ad785f2bcbe913a55ed46e0 --- authfs/Android.bp | 3 --- authfs/fd_server/Android.bp | 6 ------ compos/Android.bp | 1 - compos/common/Android.bp | 3 --- microdroid_manager/Android.bp | 3 --- virtualizationmanager/Android.bp | 1 - vmclient/Android.bp | 3 --- 7 files changed, 20 deletions(-) diff --git a/authfs/Android.bp b/authfs/Android.bp index 523da35c..154a1d6b 100644 --- a/authfs/Android.bp +++ b/authfs/Android.bp @@ -33,9 +33,6 @@ rust_defaults { enabled: false, }, }, - shared_libs: [ - "libbinder_rpc_unstable", - ], defaults: ["crosvm_defaults"], } diff --git a/authfs/fd_server/Android.bp b/authfs/fd_server/Android.bp index f7cb5e3e..50974084 100644 --- a/authfs/fd_server/Android.bp +++ b/authfs/fd_server/Android.bp @@ -18,9 +18,6 @@ rust_binary { "librpcbinder_rs", ], prefer_rlib: true, - shared_libs: [ - "libbinder_rpc_unstable", - ], apex_available: ["com.android.virt"], } @@ -40,8 +37,5 @@ rust_test { "librpcbinder_rs", ], prefer_rlib: true, - shared_libs: [ - "libbinder_rpc_unstable", - ], test_suites: ["general-tests"], } diff --git a/compos/Android.bp b/compos/Android.bp index 0890e9d2..2f6be982 100644 --- a/compos/Android.bp +++ b/compos/Android.bp @@ -27,7 +27,6 @@ rust_defaults { ], prefer_rlib: true, shared_libs: [ - "libbinder_rpc_unstable", "libcrypto", ], } diff --git a/compos/common/Android.bp b/compos/common/Android.bp index 7a7042e6..35947d71 100644 --- a/compos/common/Android.bp +++ b/compos/common/Android.bp @@ -20,9 +20,6 @@ rust_library { "libvmclient", ], proc_macros: ["libnum_derive"], - shared_libs: [ - "libbinder_rpc_unstable", - ], apex_available: [ "com.android.compos", ], diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp index bf2d7557..18cf49de 100644 --- a/microdroid_manager/Android.bp +++ b/microdroid_manager/Android.bp @@ -46,9 +46,6 @@ rust_defaults { "libvsock", "librand", ], - shared_libs: [ - "libbinder_rpc_unstable", - ], init_rc: ["microdroid_manager.rc"], multilib: { lib32: { diff --git a/virtualizationmanager/Android.bp b/virtualizationmanager/Android.bp index e82797ef..c913d02c 100644 --- a/virtualizationmanager/Android.bp +++ b/virtualizationmanager/Android.bp @@ -60,7 +60,6 @@ rust_defaults { "packagemanager_aidl-rust", ], shared_libs: [ - "libbinder_rpc_unstable", "libselinux", ], } diff --git a/vmclient/Android.bp b/vmclient/Android.bp index 0a2e6927..8517c887 100644 --- a/vmclient/Android.bp +++ b/vmclient/Android.bp @@ -18,9 +18,6 @@ rust_library { "libshared_child", "libthiserror", ], - shared_libs: [ - "libbinder_rpc_unstable", - ], apex_available: [ "com.android.compos", "com.android.virt",