From 27501b58d0d88b999b8e574591ce7231ab088ea9 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 4 Feb 2020 17:03:22 +0900 Subject: [PATCH] Disable HTTP proxy feature Change-Id: I10117b7ef87ac24fecc9f98261e45210c0498739 Signed-off-by: DoHyun Pyun --- CMakeLists.txt | 5 +++-- packaging/bluetooth-frwk.spec | 12 +++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03cf2ec..548eeec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,9 @@ ADD_SUBDIRECTORY(bt-api) ADD_SUBDIRECTORY(bt-oal) ADD_SUBDIRECTORY(bt-service-adaptation) -# TODO_40 : 4.0 merge -ADD_SUBDIRECTORY(bt-httpproxy) +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_FEATURE_BT_HTTP_PROXY") +#ADD_SUBDIRECTORY(bt-httpproxy) +ENDIF() # TODO_40 : 4.0 merge ADD_SUBDIRECTORY(bt-otp) diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec index a18d3b2..74015cb 100644 --- a/packaging/bluetooth-frwk.spec +++ b/packaging/bluetooth-frwk.spec @@ -20,6 +20,7 @@ Requires: bluetooth-tools %define bt_bluez_hal ENABLED %define bt_gatt_client_fd ENABLED %define bt_permanent_log DISABLED +%define bt_http_proxy DISABLED BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(dlog) @@ -33,7 +34,9 @@ BuildRequires: pkgconfig(capi-network-connection) BuildRequires: pkgconfig(alarm-service) BuildRequires: pkgconfig(capi-content-mime-type) BuildRequires: pkgconfig(eventsystem) +%if %{bt_http_proxy} == ENABLED BuildRequires: pkgconfig(libsoup-2.4) +%endif BuildRequires: pkgconfig(capi-network-tethering) BuildRequires: cmake BuildRequires: pkgconfig(cynara-client) @@ -138,6 +141,7 @@ Requires: %{name} = %{version}-%{release} %description service This package is Bluetooth Service daemon to manage BT services. +%if %{bt_http_proxy} == ENABLED %package httpproxy Summary: Bluetooth HTTP Proxy Service daemon Group: Network & Connectivity/Bluetooth @@ -145,6 +149,7 @@ Requires: %{name} = %{version}-%{release} %description httpproxy This package is Bluetooth HTTP Proxy Service daemon +%endif %package otp Summary: Bluetooth OTP Service daemon @@ -266,6 +271,10 @@ export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_GATT_CLIENT_FD_DISABLE" export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_PERMANENT_LOG" %endif +%if %{bt_http_proxy} == ENABLED +export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_HTTP_PROXY" +%endif + %ifarch %{ix86} x86_64 export CFLAGS+=" -DTIZEN_TEST_EMUL" export CXXFLAGS+=" -DTIZEN_TEST_EMUL" @@ -452,6 +461,7 @@ popd %{_prefix}/etc/bluetooth %attr(-,network_fw,network_fw) %{_varlibdir}/bluetooth/auto-pair-blacklist +%if %{bt_http_proxy} == ENABLED %files httpproxy %manifest %{name}.manifest %license LICENSE @@ -459,7 +469,7 @@ popd %{_bindir}/bt-httpproxy %{_datadir}/dbus-1/system-services/org.projectx.httpproxy.service %{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-httpproxy.conf - +%endif %files otp %manifest %{name}.manifest -- 2.7.4