commit f2d06dbd9f70b1630a76650988e1e575603e1a51
author Xin Li <delphij@google.com> Thu Oct 07 23:50:52 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 07 23:50:52 2021 +0000
tree 1b674b7e6313c523ab0d72166fd0ed81e71e581c
parent 66671fcdb4911bf16ba8c586fc19a82ab44b909d
parent b85642647a1dd330ad85640b19cd02f24983d6d4

Merge "Merge Android 12"

libs/adbconnection/Android.bp

diff --git a/libs/adbconnection/Android.bp b/libs/adbconnection/Android.bp
index 4e177bd..da0b5b6 100644
--- a/libs/adbconnection/Android.bp
+++ b/libs/adbconnection/Android.bp
@@ -18,10 +18,8 @@
     export_include_dirs: ["include"],
 
     stl: "libc++_static",
-    shared_libs: [
-      "libbase",
-      "liblog",
-    ],
+    shared_libs: ["liblog"],
+    static_libs: ["libbase"],
 
     defaults: ["adbd_defaults", "host_adbd_supported"],
 
@@ -44,10 +42,8 @@
     export_include_dirs: ["include"],
 
     stl: "libc++_static",
-    shared_libs: [
-      "libbase",
-      "liblog",
-    ],
+    shared_libs: ["liblog"],
+    static_libs: ["libbase"],
 
     defaults: ["adbd_defaults"],
     visibility: [

libs/libadbd_fs/Android.bp

diff --git a/libs/libadbd_fs/Android.bp b/libs/libadbd_fs/Android.bp
index 3c16746..ef7bc10 100644
--- a/libs/libadbd_fs/Android.bp
+++ b/libs/libadbd_fs/Android.bp
@@ -14,8 +14,8 @@
     defaults: ["adbd_defaults"],
 
     srcs: ["adbd_fs.cpp"],
-    shared_libs: ["libbase"],
     static_libs: [
+        "libbase",
         "libcutils",
         "liblog",
     ],

pairing_auth/Android.bp

diff --git a/pairing_auth/Android.bp b/pairing_auth/Android.bp
index 52e647c..e2e9fc4 100644
--- a/pairing_auth/Android.bp
+++ b/pairing_auth/Android.bp
@@ -60,8 +60,8 @@
 
     stl: "libc++_static",
 
+    static_libs: ["libbase"],
     shared_libs: [
-        "libbase",
         "libcrypto",
         "liblog",
     ],

pairing_connection/Android.bp

diff --git a/pairing_connection/Android.bp b/pairing_connection/Android.bp
index e27b524..3c5b0a3 100644
--- a/pairing_connection/Android.bp
+++ b/pairing_connection/Android.bp
@@ -67,13 +67,13 @@
     recovery_available: false,
 
     static_libs: [
-        "libadb_pairing_auth",
+        "libbase",
         "libssl",
     ],
     shared_libs: [
-        "libbase",
         "libcrypto",
         "liblog",
+        "libadb_pairing_auth",
     ],
 }
 
@@ -146,12 +146,16 @@
 
     stl: "libc++_static",
 
-    shared_libs: [
-        "libadb_pairing_connection",
+    static_libs: [
         "libbase",
+    ],
+    shared_libs: [
         "libcrypto",
+        "libcrypto_utils",
         "libcutils",
         "liblog",
+        "libadb_pairing_auth",
+        "libadb_pairing_connection",
     ],
 }