aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/adbconnection/Android.bp12
-rw-r--r--libs/libadbd_fs/Android.bp2
-rw-r--r--pairing_auth/Android.bp2
-rw-r--r--pairing_connection/Android.bp12
4 files changed, 14 insertions, 14 deletions
diff --git a/libs/adbconnection/Android.bp b/libs/adbconnection/Android.bp
index da0b5b61..4e177bdc 100644
--- a/libs/adbconnection/Android.bp
+++ b/libs/adbconnection/Android.bp
@@ -18,8 +18,10 @@ cc_library {
export_include_dirs: ["include"],
stl: "libc++_static",
- shared_libs: ["liblog"],
- static_libs: ["libbase"],
+ shared_libs: [
+ "libbase",
+ "liblog",
+ ],
defaults: ["adbd_defaults", "host_adbd_supported"],
@@ -42,8 +44,10 @@ cc_library {
export_include_dirs: ["include"],
stl: "libc++_static",
- shared_libs: ["liblog"],
- static_libs: ["libbase"],
+ shared_libs: [
+ "libbase",
+ "liblog",
+ ],
defaults: ["adbd_defaults"],
visibility: [
diff --git a/libs/libadbd_fs/Android.bp b/libs/libadbd_fs/Android.bp
index ef7bc106..3c16746e 100644
--- a/libs/libadbd_fs/Android.bp
+++ b/libs/libadbd_fs/Android.bp
@@ -14,8 +14,8 @@ cc_library {
defaults: ["adbd_defaults"],
srcs: ["adbd_fs.cpp"],
+ shared_libs: ["libbase"],
static_libs: [
- "libbase",
"libcutils",
"liblog",
],
diff --git a/pairing_auth/Android.bp b/pairing_auth/Android.bp
index e2e9fc45..52e647ca 100644
--- a/pairing_auth/Android.bp
+++ b/pairing_auth/Android.bp
@@ -60,8 +60,8 @@ cc_defaults {
stl: "libc++_static",
- static_libs: ["libbase"],
shared_libs: [
+ "libbase",
"libcrypto",
"liblog",
],
diff --git a/pairing_connection/Android.bp b/pairing_connection/Android.bp
index 3c5b0a3f..e27b524b 100644
--- a/pairing_connection/Android.bp
+++ b/pairing_connection/Android.bp
@@ -67,13 +67,13 @@ cc_defaults {
recovery_available: false,
static_libs: [
- "libbase",
+ "libadb_pairing_auth",
"libssl",
],
shared_libs: [
+ "libbase",
"libcrypto",
"liblog",
- "libadb_pairing_auth",
],
}
@@ -146,16 +146,12 @@ cc_defaults {
stl: "libc++_static",
- static_libs: [
- "libbase",
- ],
shared_libs: [
+ "libadb_pairing_connection",
+ "libbase",
"libcrypto",
- "libcrypto_utils",
"libcutils",
"liblog",
- "libadb_pairing_auth",
- "libadb_pairing_connection",
],
}