From 76ac588516a5858c5a1552dcd8c596c51a508a54 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Fri, 7 Oct 2022 13:42:24 +0900 Subject: [PATCH] universal7885: Export channel buffer size as cc_default --- .../apps/aidl-support/fm/default/Android.bp | 10 +++++++++- .../aidl-support/fm/default/libfm_slsi-impl/Android.bp | 5 ++++- .../fm/default/libfm_slsi-impl/FM_Device_ctl.cpp | 2 -- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/universal7885-common/apps/aidl-support/fm/default/Android.bp b/universal7885-common/apps/aidl-support/fm/default/Android.bp index eb6913e..50b325d 100644 --- a/universal7885-common/apps/aidl-support/fm/default/Android.bp +++ b/universal7885-common/apps/aidl-support/fm/default/Android.bp @@ -1,3 +1,8 @@ +cc_defaults { + name: "fm_aidl_defaults", + cflags: ["-DTRACK_SIZE=30"], +} + cc_binary { name: "vendor.eureka.hardware.fmradio-service", srcs: [ @@ -5,7 +10,10 @@ cc_binary { "FMDevControl.cpp", "service.cpp", ], - defaults: ["eureka_defaults"], + defaults: [ + "eureka_defaults", + "fm_aidl_defaults", + ], static_libs: ["libfm_slsi-impl"], shared_libs: [ "libbase", diff --git a/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/Android.bp b/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/Android.bp index fd85b55..f31c6fe 100644 --- a/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/Android.bp +++ b/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/Android.bp @@ -7,5 +7,8 @@ cc_library_static { "FM_Device_ctl.cpp", ], export_include_dirs: ["public"], - defaults: ["eureka_defaults"], + defaults: [ + "eureka_defaults", + "fm_aidl_defaults", + ], } diff --git a/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FM_Device_ctl.cpp b/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FM_Device_ctl.cpp index 4fb4a88..399ad1c 100644 --- a/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FM_Device_ctl.cpp +++ b/universal7885-common/apps/aidl-support/fm/default/libfm_slsi-impl/FM_Device_ctl.cpp @@ -14,8 +14,6 @@ namespace fm_radio_slsi { -constexpr const int TRACK_SIZE = 30; - static bool FMThread = false; int open_device(void) {