From 43f9a07e04a32cd1afd6b4d93ed6e9f4429934d3 Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Mon, 22 Aug 2022 16:32:46 +0000 Subject: [PATCH] AIDL effect: Extract common parts of effect service into cc_defaults Bug: b/238913361 Test: atest VtsHalAudioEffectTargetTest Merged-In: I58d925b3f4a3d41d4014f54f78d95c26cc5520ea Change-Id: I58d925b3f4a3d41d4014f54f78d95c26cc5520ea (cherry picked from commit c8ed5c27a163ba922f403164db1ab8dc6214f9d0) --- audio/aidl/default/Android.bp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/audio/aidl/default/Android.bp b/audio/aidl/default/Android.bp index 5354b8e329..f536776c98 100644 --- a/audio/aidl/default/Android.bp +++ b/audio/aidl/default/Android.bp @@ -52,8 +52,8 @@ cc_binary { srcs: ["main.cpp"], } -cc_library_static { - name: "libaudioeffectserviceexampleimpl", +cc_defaults { + name: "aidlaudioeffectservice_defaults", vendor: true, shared_libs: [ "libbase", @@ -61,6 +61,17 @@ cc_library_static { "android.media.audio.common.types-V1-ndk", "android.hardware.audio.effect-V1-ndk", ], + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + "-Wthread-safety", + ], +} + +cc_library_static { + name: "libaudioeffectserviceexampleimpl", + defaults: ["aidlaudioeffectservice_defaults"], export_include_dirs: ["include"], srcs: [ "EffectFactory.cpp", @@ -75,21 +86,9 @@ cc_binary { relative_install_path: "hw", init_rc: ["android.hardware.audio.effect.service-aidl.example.rc"], vintf_fragments: ["android.hardware.audio.effect.service-aidl.xml"], - vendor: true, - shared_libs: [ - "libbase", - "libbinder_ndk", - "android.media.audio.common.types-V1-ndk", - "android.hardware.audio.effect-V1-ndk", - ], + defaults: ["aidlaudioeffectservice_defaults"], static_libs: [ "libaudioeffectserviceexampleimpl", ], - cflags: [ - "-Wall", - "-Wextra", - "-Werror", - "-Wthread-safety", - ], srcs: ["EffectMain.cpp"], }