Merge "headless: break out modules from headless infra"

system/test/headless/Android.bp

@@ -24,6 +24,22 @@ genrule {
   ],
 }
 
+filegroup {
+    name: "TestHeadlessModules",
+    srcs: [
+          "connect/connect.cc",
+          "discovery/discovery.cc",
+          "dumpsys/dumpsys.cc",
+          "nop/nop.cc",
+          "pairing/pairing.cc",
+          "read/name.cc",
+          "read/read.cc",
+          "scan/scan.cc",
+          "sdp/sdp.cc",
+          "sdp/sdp_db.cc",
+     ],
+}
+
 cc_binary {
     name: "bt_headless",
     defaults: [
@@ -39,23 +55,14 @@ cc_binary {
         "HeadlessBuildTimestamp",
     ],
     srcs: [
+        ":TestHeadlessModules",
         "bt_property.cc",
-        "connect/connect.cc",
         "get_options.cc",
         "headless.cc",
         "log.cc",
         "main.cc",
         "messenger.cc",
-        "pairing/pairing.cc",
         "util.cc",
-        "discovery/discovery.cc",
-        "dumpsys/dumpsys.cc",
-        "scan/scan.cc",
-        "sdp/sdp.cc",
-        "sdp/sdp_db.cc",
-        "nop/nop.cc",
-        "read/read.cc",
-        "read/name.cc",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",