diff options
author | Franois Gaffie <francois.gaffie@renault.com> | 2019-10-10 09:07:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-10 09:07:27 -0700 |
commit | 46c44a6f6760c4507ad5475fa89c6f7834cfee90 (patch) | |
tree | 85dee6cd0c4752892eafe479c211a1b1dfc2486c | |
parent | 34e1856164e14790bfe8b09a0897afa5b390bbb5 (diff) | |
parent | 935b431447525e2f487f1e3d41378fe0b216f015 (diff) | |
download | parameter-framework-46c44a6f6760c4507ad5475fa89c6f7834cfee90.tar.gz |
parameter-framework: simplify makefile am: 8f68e740eb am: b09f326547
am: 935b431447
Change-Id: I364d3abb254696fee7afd0d0f83f31bfdf225981
-rw-r--r-- | Android.bp | 37 |
1 files changed, 12 insertions, 25 deletions
@@ -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", |