diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-04 11:04:39 -0700 |
|---|---|---|
| committer | Justin Yun <justinyun@google.com> | 2017-08-08 13:57:49 +0900 |
| commit | c75fc62c3a511350109625ed5b3fbd0986163089 (patch) | |
| tree | a777a9d47077c2244327bfc445d4f5f9420a5f87 | |
| parent | 768011e1c11ea8b66e2fa9a1391b046f7e901448 (diff) | |
| download | libhidl-c75fc62c3a511350109625ed5b3fbd0986163089.tar.gz | |
Replace soong variables with cc_defaults.
Bug: 64318482
Test: links
Change-Id: Id03af485a4282db5b9a13a79fce00a2d66b59ffc
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | base/Android.bp | 2 | ||||
| -rw-r--r-- | libhidlmemory/Android.bp | 2 | ||||
| -rw-r--r-- | transport/Android.bp | 6 | ||||
| -rw-r--r-- | transport/allocator/1.0/default/Android.bp | 2 | ||||
| -rw-r--r-- | transport/memory/1.0/default/Android.bp | 2 |
6 files changed, 17 insertions, 11 deletions
@@ -18,13 +18,17 @@ subdirs = [ "transport", // libhidltransport ] -libhidl_flags = [ - "-Wall", - "-Werror", -] +cc_defaults { + name: "libhidl-defaults", + cflags: [ + "-Wall", + "-Werror", + ], +} cc_test { name: "libhidl_test", + defaults: ["libhidl-defaults"], gtest: false, srcs: ["test_main.cpp"], @@ -42,5 +46,5 @@ cc_test { cflags: [ "-O0", "-g", - ] + libhidl_flags, + ], } diff --git a/base/Android.bp b/base/Android.bp index 5a38ed8..5d79e81 100644 --- a/base/Android.bp +++ b/base/Android.bp @@ -19,7 +19,7 @@ cc_library_shared { enabled: true, support_system_process: true, }, - cflags: libhidl_flags, + defaults: ["libhidl-defaults"], shared_libs: [ "libbase", "libcutils", diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp index 59ce7a8..e854ab5 100644 --- a/libhidlmemory/Android.bp +++ b/libhidlmemory/Android.bp @@ -19,7 +19,7 @@ cc_library { enabled: true, support_system_process: true, }, - cflags: libhidl_flags, + defaults: ["libhidl-defaults"], shared_libs: [ "libbase", "liblog", diff --git a/transport/Android.bp b/transport/Android.bp index acd3d2c..62aee52 100644 --- a/transport/Android.bp +++ b/transport/Android.bp @@ -31,8 +31,10 @@ cc_library_shared { enabled: true, support_system_process: true, }, - defaults: ["hidl-module-defaults"], - cflags: libhidl_flags, + defaults: [ + "libhidl-defaults", + "hidl-module-defaults", + ], shared_libs: [ "libbase", "liblog", diff --git a/transport/allocator/1.0/default/Android.bp b/transport/allocator/1.0/default/Android.bp index 7d5fd8b..fc352c3 100644 --- a/transport/allocator/1.0/default/Android.bp +++ b/transport/allocator/1.0/default/Android.bp @@ -15,7 +15,7 @@ cc_binary { name: "android.hidl.allocator@1.0-service", relative_install_path: "hw", - cflags: libhidl_flags, + defaults: ["libhidl-defaults"], srcs: [ "AshmemAllocator.cpp", "service.cpp" diff --git a/transport/memory/1.0/default/Android.bp b/transport/memory/1.0/default/Android.bp index 93f6370..a996f26 100644 --- a/transport/memory/1.0/default/Android.bp +++ b/transport/memory/1.0/default/Android.bp @@ -16,7 +16,7 @@ cc_library_shared { name: "android.hidl.memory@1.0-impl", compile_multilib: "both", relative_install_path: "hw", - cflags: libhidl_flags, + defaults: ["libhidl-defaults"], srcs: [ "AshmemMapper.cpp", "AshmemMemory.cpp", |