diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-30 12:47:08 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-30 12:47:08 +0000 |
commit | 263638c189867d781d0ec4b9568fe5166dd0a1dc (patch) | |
tree | 3f4adef7bceceddd7d7ccdcce6f8b25e903172f8 | |
parent | b1dc68a846da7cd3bdf400d8d01b5c84643a5576 (diff) | |
parent | 20467725a2aeb324f03b6bae9b54d54ebbc1c3cb (diff) | |
download | parameter-framework-263638c189867d781d0ec4b9568fe5166dd0a1dc.tar.gz |
Snap for 5515639 from 20467725a2aeb324f03b6bae9b54d54ebbc1c3cb to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android10-mainline-releaseandroid10-mainline-a-release
Change-Id: I7d7529c31646d50d9d6ec332358baaabf3db72dd
-rw-r--r-- | Android.bp | 57 |
1 files changed, 47 insertions, 10 deletions
@@ -29,6 +29,7 @@ cc_defaults { name: "pfw_defaults", host_supported: true, + vendor_available: true, cflags: [ "-frtti", @@ -44,6 +45,7 @@ cc_library_static { name: "libpfw_utility", defaults: ["pfw_defaults"], host_supported: true, + vendor_available: true, export_include_dirs: ["upstream/utility"], @@ -55,12 +57,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,8 +78,20 @@ 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"], + vendor_available: true, cppflags: [ "-Wno-instantiation-after-specialization", @@ -93,12 +106,10 @@ cc_library_shared { "support/android/parameter", ], shared_libs: [ - "libremote-processor", - "libandroidicu", + "libxml2", ], static_libs: [ "libpfw_utility", - "libxml2", ], srcs: [ @@ -185,20 +196,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 +480,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"], +} |