From: Lukasz Bardeli Date: Fri, 24 Nov 2017 07:42:32 +0000 (+0100) Subject: Merge branch 'tizen_4.0' into tizen X-Git-Tag: submit/tizen/20171130.124131~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9041983d7459f28ea32afafd4e3b7e0b6d49b5bc;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Merge branch 'tizen_4.0' into tizen voice control temporally disabled until voice-control package will be synchronized Change-Id: I2106ffe625259361cb5db18207742b66d80a5716 Signed-off-by: Lukasz Bardeli --- 9041983d7459f28ea32afafd4e3b7e0b6d49b5bc diff --cc packaging/webapi-plugins.spec index ea2275ca,16d1fe62..1d34ae03 --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@@ -157,6 -159,8 +159,8 @@@ Source0: %{name}-%{version}.tar.g %define tizen_mobile_feature_tvinputdevice_support 0 -%define tizen_mobile_feature_voicecontrol_support 1 ++%define tizen_mobile_feature_voicecontrol_support 0 + %define tizen_mobile_feature_ppm_support 1 #################################################################### # Wearable Profile : B2 / TW2 # @@@ -233,6 -236,9 +236,9 @@@ %define tizen_wearable_feature_inputdevice_support 1 %define tizen_wearable_feature_tvinputdevice_support 0 -%define tizen_wearable_feature_voicecontrol_support 1 ++%define tizen_wearable_feature_voicecontrol_support 0 + %define tizen_wearable_feature_ppm_support 1 + #################################################################### # TV Profile # @@@ -287,6 -293,8 +293,8 @@@ %define tizen_tv_feature_wi_fi_support 1 %define tizen_tv_feature_inputdevice_support 0 %define tizen_tv_feature_tvinputdevice_support 1 -%define tizen_tv_feature_voicecontrol_support 1 ++%define tizen_tv_feature_voicecontrol_support 0 + %define tizen_tv_feature_ppm_support 0 # common, or "unified (undefined)" %define unified_build 1