From 9cb3385e519fe80129b71404c0200dac184b03a4 Mon Sep 17 00:00:00 2001
From: Francois Gaffie <francois.gaffie@renault.com>
Date: Wed, 6 Feb 2019 08:10:16 +0100
Subject: Provides Networking targets to enable debug through unix socket

This CL adds *-networking targets component in order to allow
using the parameter-framework debug tools.

Bug: 130284799
Test: make

Change-Id: Idc5f94e28cfbab6550c5d0294704168a140ce313
Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
---
 Android.bp | 51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/Android.bp b/Android.bp
index 8b2943e..9bc7deb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,12 +55,11 @@ cc_library_static {
     ],
 }
 
-cc_library_shared {
-    name: "libremote-processor",
+cc_defaults {
+    name: "libremote-processor-defaults",
     defaults: ["pfw_defaults"],
 
     cflags: ["-Wno-implicit-fallthrough"],
-    local_include_dirs: ["upstream/asio/stub"],
     export_include_dirs: [
         "upstream/remote-processor",
         "support/android/remote-processor",
@@ -77,7 +76,18 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "libparameter",
+    name: "libremote-processor",
+    defaults: ["libremote-processor-defaults"],
+
+    local_include_dirs: [
+        "asio/include",
+        "support/android/asio",
+    ],
+    cflags: ["-Wno-unused-local-typedef"],
+}
+
+cc_defaults {
+    name: "libparameter-defaults",
     defaults: ["pfw_defaults"],
 
     cppflags: [
@@ -93,7 +103,6 @@ cc_library_shared {
         "support/android/parameter",
     ],
     shared_libs: [
-        "libremote-processor",
         "libandroidicu",
     ],
     static_libs: [
@@ -185,20 +194,32 @@ cc_library_shared {
     ],
 }
 
+cc_library_shared {
+    name: "libparameter",
+    defaults: ["libparameter-defaults"],
+    shared_libs: [
+        "libremote-processor",
+    ],
+}
+
+// Userdebug only, should not be used in a user build device image.
 cc_binary {
     name: "test-platform",
     defaults: ["pfw_defaults"],
 
-    cflags: ["-Wno-implicit-fallthrough"],
     local_include_dirs: [
         "upstream/test/test-platform",
-        "upstream/asio/stub",
+        "support/android/asio",
+        "asio/include",
     ],
-
     srcs: [
         "upstream/test/test-platform/main.cpp",
         "upstream/test/test-platform/TestPlatform.cpp",
     ],
+    cflags: [
+        "-Wno-unused-local-typedef",
+        "-Wno-implicit-fallthrough"
+    ],
     static_libs: ["libpfw_utility"],
     shared_libs: [
         "libparameter",
@@ -457,3 +478,17 @@ cc_prebuilt_binary {
 }
 
 //////////////////////////////////////////////////
+
+cc_binary {
+    name: "remote-process",
+    defaults: ["pfw_defaults"],
+
+    srcs: ["upstream/remote-process/main.cpp"],
+    local_include_dirs: [
+        "upstream/utility",
+        "support/android/asio",
+        "asio/include",
+    ],
+    cflags: ["-Wno-unused-local-typedef"],
+    shared_libs: ["libremote-processor"],
+}
-- 
cgit v1.2.3