parameter-framework: simplify makefile

Android R follow-up CL of
"Provides Networking targets to enable debug through unix socket"

Test: build
Change-Id: Iaa7eb6e78cc50fb3acedcdf5ba898d2495df44a8
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

1 files changed, 12 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
index 2b09740..57f7b36 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,16 +57,17 @@ cc_library_static {
     ],
 }
 
-cc_defaults {
-    name: "libremote-processor-defaults",
+cc_library_shared {
+    name: "libremote-processor",
     defaults: ["pfw_defaults"],
-
-    cflags: ["-Wno-implicit-fallthrough"],
     export_include_dirs: [
         "upstream/remote-processor",
         "support/android/remote-processor",
     ],
-
+    local_include_dirs: [
+        "asio/include",
+        "support/android/asio",
+    ],
     srcs: [
         "upstream/remote-processor/RequestMessage.cpp",
         "upstream/remote-processor/Message.cpp",
@@ -74,22 +75,15 @@ cc_defaults {
         "upstream/remote-processor/RemoteProcessorServer.cpp",
         "upstream/remote-processor/BackgroundRemoteProcessorServer.cpp",
     ],
+    cflags: [
+        "-Wno-unused-local-typedef",
+        "-Wno-implicit-fallthrough"
+    ],
     static_libs: ["libpfw_utility"],
 }
 
 cc_library_shared {
-    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",
+    name: "libparameter",
     defaults: ["pfw_defaults"],
     vendor_available: true,
 
@@ -107,6 +101,7 @@ cc_defaults {
     ],
     shared_libs: [
         "libxml2",
+        "libremote-processor",
     ],
     static_libs: [
         "libpfw_utility",
@@ -196,14 +191,6 @@ cc_defaults {
     ],
 }
 
-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",