commit 6f6a8cc15a14af3e618e25d32b041fe12b7078ad
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 12 02:06:09 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 12 02:06:09 2020 +0000
tree 771084ddee8df0b858b1ad1f52b73d14f56a2b55
parent ecf4836b6c7a837b35cc0e425db1bd9e35831835
parent ca3a4b61bfec2a3b8b5721568fa6b8f106009429

Merge "adbd: make libadbd_services cc_library again." into rvc-dev

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index a26017f..e02a54e 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -429,7 +429,7 @@
     },
 }
 
-cc_library_static {
+cc_library {
     name: "libadbd_services",
     defaults: ["adbd_defaults", "host_adbd_supported"],
     recovery_available: true,
@@ -464,6 +464,7 @@
         "libbase",
         "libcrypto",
         "libcrypto_utils",
+        "libcutils_sockets",
         "liblog",
     ],
 
@@ -515,6 +516,7 @@
         "libadb_tls_connection",
         "libadbd_auth",
         "libadbd_fs",
+        "libadbd_services",
         "libasyncio",
         "libbase",
         "libcrypto",
@@ -533,7 +535,6 @@
     },
 
     static_libs: [
-        "libadbd_services",
         "libcutils_sockets",
         "libdiagnose_usb",
         "libmdnssd",

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 4e93df3..fc06c1d 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -45,13 +45,9 @@
 }
 
 // Socket specific parts of libcutils that are safe to statically link into an APEX.
-cc_library_static {
+cc_library {
     name: "libcutils_sockets",
     vendor_available: true,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     recovery_available: true,
     host_supported: true,
     native_bridge_supported: true,
@@ -62,6 +58,7 @@
 
     export_include_dirs: ["include"],
 
+    shared_libs: ["liblog"],
     srcs: ["sockets.cpp"],
     target: {
         linux_bionic: {