commit 112eded7e34942f7fe844d758791934cdf28d021
author Oriol Prieto Gasco <opg@google.com> Wed Oct 06 01:14:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 06 01:14:40 2021 +0000
tree 214ebd6d922a40240ee837f47fb531c330fa456e
parent 21db75021236feca186f1ebd2d6d6a5ebac082bb
parent 40218d97d015728b8138acd3a02c2f231e3971d9

Merge "Changes to linking strategy" am: 40218d97d0

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

Change-Id: Id47621d69b81447d651caf4e32b7de3779fe5065

libs/adbconnection/Android.bp

diff --git a/libs/adbconnection/Android.bp b/libs/adbconnection/Android.bp
index da0b5b6..4e177bd 100644
--- a/libs/adbconnection/Android.bp
+++ b/libs/adbconnection/Android.bp
@@ -18,8 +18,10 @@
     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 @@
     export_include_dirs: ["include"],
 
     stl: "libc++_static",
-    shared_libs: ["liblog"],
-    static_libs: ["libbase"],
+    shared_libs: [
+      "libbase",
+      "liblog",
+    ],
 
     defaults: ["adbd_defaults"],
     visibility: [

libs/libadbd_fs/Android.bp

diff --git a/libs/libadbd_fs/Android.bp b/libs/libadbd_fs/Android.bp
index ef7bc10..3c16746 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 e2e9fc4..52e647c 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 3c5b0a3..e27b524 100644
--- a/pairing_connection/Android.bp
+++ b/pairing_connection/Android.bp
@@ -67,13 +67,13 @@
     recovery_available: false,
 
     static_libs: [
-        "libbase",
+        "libadb_pairing_auth",
         "libssl",
     ],
     shared_libs: [
+        "libbase",
         "libcrypto",
         "liblog",
-        "libadb_pairing_auth",
     ],
 }
 
@@ -146,16 +146,12 @@
 
     stl: "libc++_static",
 
-    static_libs: [
-        "libbase",
-    ],
     shared_libs: [
+        "libadb_pairing_connection",
+        "libbase",
         "libcrypto",
-        "libcrypto_utils",
         "libcutils",
         "liblog",
-        "libadb_pairing_auth",
-        "libadb_pairing_connection",
     ],
 }