From: Wootak Jung Date: Sun, 4 Jun 2023 23:46:04 +0000 (+0900) Subject: Disable map-agent in DA profile X-Git-Tag: accepted/tizen/unified/20230628.155146~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca4393c38a712ae23e976ca4df1d6c7c1a74e7a0;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-agent.git Disable map-agent in DA profile msg-service was not supported in DA profile Change-Id: I5768f16d00c4f0a45013b83ddbaaad99900e9bd5 Signed-off-by: Wootak Jung --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 492d084..ef18400 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_SUBDIRECTORY(hf-agent) +IF (DA_PROFILE) +ELSE (DA_PROFILE) ADD_SUBDIRECTORY(map-agent) +ENDIF (DA_PROFILE) ADD_SUBDIRECTORY(pb-agent) ADD_SUBDIRECTORY(ag-agent) ADD_SUBDIRECTORY(ipsp-agent) diff --git a/packaging/bluetooth-agent.spec b/packaging/bluetooth-agent.spec index 3b5b413..5211e43 100644 --- a/packaging/bluetooth-agent.spec +++ b/packaging/bluetooth-agent.spec @@ -25,7 +25,7 @@ BuildRequires: pkgconfig(capi-appfw-app-manager) BuildRequires: pkgconfig(capi-system-device) %endif # This usage of profile macro does NOT conflict 4.0 configurability. -%if "%{?profile}" != "wearable" && "%{?profile}" != "ivi" +%if "%{?profile}" != "wearable" && "%{?profile}" != "ivi" && !0%{?_with_da_profile:1} # Original: common, mobile, tv. Added: "undefined" BuildRequires: pkgconfig(contacts-service2) BuildRequires: pkgconfig(msg-service) @@ -71,12 +71,14 @@ Group: Network & Connectivity/Bluetooth %description hfp_hf Bluetooth agent binary compiled for HFP(Hands-Free Profile)'s HF(Hands-Free) role +%if !0%{?_with_da_profile:1} %package map Summary: Bluetooth agent for MAP(Message Access Profile) server Requires: %{name} = %{version}-%{release} Group: Network & Connectivity/Bluetooth %description map Bluetooth agent binary compiled for MAP(Message Access Profile) server +%endif %package pbap Summary: Bluetooth agent for PBAP(PhoneBook Access Profile) server @@ -142,7 +144,8 @@ export LDFLAGS+=" -lgcov" %cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DTIZEN_FEATURE_BT_HFP_AG=1 \ -DBUILD_GTESTS=%{?gcov:1}%{!?gcov:0} \ - -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} + -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \ + -DDA_PROFILE=%{?_with_da_profile:1}%{!?_with_da_profile:0} make VERBOSE=1 @@ -167,7 +170,9 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants/ #install -D -m 0644 %{buildroot}/usr/bin/bluetooth-hf-agent %{buildroot}%{_bindir}/ #install -D -m 0644 %{buildroot}/usr/bin/bluetooth-ipsp-agent %{buildroot}%{_bindir}/ #%endif +%if !0%{?_with_da_profile:1} install -D -m 0644 packaging/bluetooth-map-agent.service %{buildroot}%{_unitdir}/bluetooth-map-agent.service +%endif install -D -m 0644 packaging/bluetooth-pbap-agent.service %{buildroot}%{_unitdir}/bluetooth-pbap-agent.service install -D -m 0644 packaging/bluetooth-ag-agent.service %{buildroot}%{_unitdir}/bluetooth-ag-agent.service install -D -m 0644 packaging/bluetooth-hf-agent.service %{buildroot}%{_unitdir}/bluetooth-hf-agent.service @@ -216,6 +221,7 @@ popd #%exclude %{_unitdir}/bluetooth-map-agent.service #%exclude %{_unitdir}/bluetooth-pbap-agent.service +%if !0%{?_with_da_profile:1} %files map %manifest %{name}.manifest %license LICENSE @@ -223,6 +229,7 @@ popd %{_datadir}/dbus-1/system-services/org.bluez.map_agent.service %{_unitdir}/bluetooth-map-agent.service %{_sysconfdir}/dbus-1/system.d/bluetooth_map_agent.conf +%endif %files pbap %manifest %{name}.manifest