From 07f46126aaafd6242723b9a2ba9d1f03434370b8 Mon Sep 17 00:00:00 2001 From: TizenAPI-Bot <37820187+TizenAPI-Bot@users.noreply.github.com> Date: Wed, 24 Jun 2020 12:33:16 +0900 Subject: [PATCH 1/1] [Build] Disable struct validation by default (#1746) Co-authored-by: Wonyoung Choi --- packaging/csapi-tizenfx.spec | 22 +++++++++++----------- packaging/csapi-tizenfx.spec.in | 22 +++++++++++----------- src/Tizen.Telephony/Interop/Interop.Telephony.cs | 2 ++ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 9d7a14c..785edf9 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -31,6 +31,7 @@ BuildRequires: dotnet-build-tools Requires(post): /usr/bin/vconftool # BuildRequires for StructValidator +%if %{defined enable_struct_test} BuildRequires: coregl BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(efl-extension) @@ -41,28 +42,26 @@ BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(capi-appfw-service-application) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-appfw-widget-application) -%if "%{profile}" != "tv" -BuildRequires: pkgconfig(capi-appfw-watch-application) -%endif BuildRequires: pkgconfig(data-control) BuildRequires: pkgconfig(capi-location-manager) BuildRequires: pkgconfig(capi-media-vision) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: pkgconfig(capi-network-wifi-direct) BuildRequires: pkgconfig(key-manager) -%if "%{profile}" == "tv" -BuildRequires: pkgconfig(trustzone-nwd) -%else -BuildRequires: pkgconfig(tef-libteec) -%endif BuildRequires: pkgconfig(capi-system-sensor) BuildRequires: pkgconfig(capi-system-runtime-info) -BuildRequires: pkgconfig(capi-telephony) BuildRequires: pkgconfig(capi-ui-inputmethod) BuildRequires: pkgconfig(stt-engine) BuildRequires: pkgconfig(tts-engine) BuildRequires: pkgconfig(chromium-efl) - +%if "%{profile}" == "tv" +BuildRequires: pkgconfig(trustzone-nwd) +%else +BuildRequires: pkgconfig(capi-appfw-watch-application) +BuildRequires: pkgconfig(capi-telephony) +BuildRequires: pkgconfig(tef-libteec) +%endif +%endif %description %{summary} @@ -173,6 +172,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true %endif %{build_cmd} --pack %{TIZEN_NET_NUGET_VERSION} +%if %{defined enable_struct_test} dotnet validate-struct %{_tizenfx_bin_path}/bin/public || echo " ####################################################### ##################### W A R N I N G ################### @@ -181,7 +181,7 @@ dotnet validate-struct %{_tizenfx_bin_path}/bin/public || echo " # It will make building errors later # ####################################################### " - +%endif # Generate filelist for rpm packaging GetFileList() { diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in index ecabe85..2f84e9e 100644 --- a/packaging/csapi-tizenfx.spec.in +++ b/packaging/csapi-tizenfx.spec.in @@ -30,6 +30,7 @@ BuildRequires: dotnet-build-tools Requires(post): /usr/bin/vconftool # BuildRequires for StructValidator +%if %{defined enable_struct_test} BuildRequires: coregl BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(efl-extension) @@ -40,28 +41,26 @@ BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(capi-appfw-service-application) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-appfw-widget-application) -%if "%{profile}" != "tv" -BuildRequires: pkgconfig(capi-appfw-watch-application) -%endif BuildRequires: pkgconfig(data-control) BuildRequires: pkgconfig(capi-location-manager) BuildRequires: pkgconfig(capi-media-vision) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: pkgconfig(capi-network-wifi-direct) BuildRequires: pkgconfig(key-manager) -%if "%{profile}" == "tv" -BuildRequires: pkgconfig(trustzone-nwd) -%else -BuildRequires: pkgconfig(tef-libteec) -%endif BuildRequires: pkgconfig(capi-system-sensor) BuildRequires: pkgconfig(capi-system-runtime-info) -BuildRequires: pkgconfig(capi-telephony) BuildRequires: pkgconfig(capi-ui-inputmethod) BuildRequires: pkgconfig(stt-engine) BuildRequires: pkgconfig(tts-engine) BuildRequires: pkgconfig(chromium-efl) - +%if "%{profile}" == "tv" +BuildRequires: pkgconfig(trustzone-nwd) +%else +BuildRequires: pkgconfig(capi-appfw-watch-application) +BuildRequires: pkgconfig(capi-telephony) +BuildRequires: pkgconfig(tef-libteec) +%endif +%endif %description %{summary} @@ -172,6 +171,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true %endif %{build_cmd} --pack %{TIZEN_NET_NUGET_VERSION} +%if %{defined enable_struct_test} dotnet validate-struct %{_tizenfx_bin_path}/bin/public || echo " ####################################################### ##################### W A R N I N G ################### @@ -180,7 +180,7 @@ dotnet validate-struct %{_tizenfx_bin_path}/bin/public || echo " # It will make building errors later # ####################################################### " - +%endif # Generate filelist for rpm packaging GetFileList() { diff --git a/src/Tizen.Telephony/Interop/Interop.Telephony.cs b/src/Tizen.Telephony/Interop/Interop.Telephony.cs index 153e0e3..74481b4 100755 --- a/src/Tizen.Telephony/Interop/Interop.Telephony.cs +++ b/src/Tizen.Telephony/Interop/Interop.Telephony.cs @@ -42,7 +42,9 @@ internal static partial class Interop SIMNotAvailable = TIZEN_ERROR_TELEPHONY | 0x1001 }; +#if !PROFILE_TV [NativeStruct("telephony_handle_list_s", Include="telephony_common.h", PkgConfig="capi-telephony")] +#endif [StructLayout(LayoutKind.Sequential)] internal struct HandleList { -- 2.7.4