diff --git a/starboard/BUILD.gn b/starboard/BUILD.gn index b37a076eeda1..b25dd19918e4 100644 --- a/starboard/BUILD.gn +++ b/starboard/BUILD.gn @@ -51,12 +51,8 @@ group("gn_all") { deps += [ "//starboard/shared/starboard/player/filter/testing:player_filter_tests($starboard_toolchain)", "//starboard/shared/starboard/player/filter/testing:player_filter_tests_install($starboard_toolchain)", + "//starboard/shared/starboard/player/filter/tools:audio_dmp_player($starboard_toolchain)", ] - - # TODO: b/296715826 - Fix build error for windows modular builds. - if (!(sb_is_modular && host_os == "win")) { - deps += [ "//starboard/shared/starboard/player/filter/tools:audio_dmp_player($starboard_toolchain)" ] - } } if (sb_enable_benchmark) { @@ -141,7 +137,7 @@ group("starboard_group") { } # TODO: b/295702296 Fix libunwind for modular builds. - if (sb_is_evergreen || host_os == "win") { + if (sb_is_evergreen) { public_deps += [ "//third_party/llvm-project/libunwind:unwind" ] } } else { diff --git a/starboard/build/config/BUILD.gn b/starboard/build/config/BUILD.gn index d31feb192e63..26833c82440a 100644 --- a/starboard/build/config/BUILD.gn +++ b/starboard/build/config/BUILD.gn @@ -133,13 +133,6 @@ config("host") { ldflags += [ "-m32" ] } } - } else if (is_win) { - # A few flags to mute MSVC compiler errors that does not appear on Linux. - cflags = [ - "/wd4267", # Possible loss of precision from size_t to a smaller type. - "/wd4715", # Not all control paths return value. - ] - configs = [ ":win_cpp17_config" ] } else if (is_apple) { configs = [ ":apple_cpp17_config" ] } @@ -269,9 +262,6 @@ config("no_pedantic_warnings") { } config("warnings_as_errors") { - if (is_win && treat_warnings_as_errors) { - cflags = [ "/WX" ] - } } # This config is defined here and added as a default config so that the flags @@ -293,9 +283,6 @@ config("default_cpp_standard") { if (current_toolchain == default_toolchain) { if (sb_is_modular || is_android) { configs = [ ":modular_cpp17_config" ] - } else if (host_os == "win") { - # These flags apply to non-modular windows platforms which includes win32, xb1. - configs = [ ":win_cpp17_config" ] } else if (is_linux) { configs = [ ":linux_non_modular_cpp17_config" ] } else if (is_apple) { @@ -312,9 +299,6 @@ config("cpp20_supported_config") { if (current_toolchain == default_toolchain) { if (sb_is_modular || is_android) { configs = [ ":modular_cpp20_config" ] - } else if (host_os == "win") { - # These flags apply to non-modular windows platforms which includes win32, xb1. - configs = [ ":win_cpp20_config" ] } else if (is_linux) { configs = [ ":linux_non_modular_cpp20_config" ] } else if (is_apple) { @@ -327,14 +311,6 @@ config("cpp20_supported_config") { } } -config("win_cpp17_config") { - cflags = [ "/std:c++17" ] -} - -config("win_cpp20_config") { - cflags = [ "/std:c++20" ] -} - config("apple_cpp17_config") { cflags_cc = [ "-std=gnu++17" ] cflags_objcc = [ "-std=gnu++17" ] diff --git a/starboard/build/config/BUILDCONFIG.gn b/starboard/build/config/BUILDCONFIG.gn index 77d7034b160e..5f2c51966a9f 100644 --- a/starboard/build/config/BUILDCONFIG.gn +++ b/starboard/build/config/BUILDCONFIG.gn @@ -184,10 +184,6 @@ if (is_qa || is_gold || sb_use_no_rtti) { default_compiler_configs += [ "//build/config/compiler:no_rtti" ] } -if (is_win) { - default_compiler_configs += [ "//build/config/win:lean_and_mean" ] -} - if (is_native_target_build) { default_compiler_configs += [ "//starboard/build/config:native_target" ] } @@ -538,11 +534,9 @@ template("shared_library") { forward_variables_from(invoker, [ "testonly" ]) deps = [ ":${actual_target_name}_loader($starboard_toolchain)", + ":${actual_target_name}_loader_copy($starboard_toolchain)", ":${actual_target_name}_loader_install($starboard_toolchain)", ] - if (host_os != "win") { - deps += [ ":${actual_target_name}_loader_copy($starboard_toolchain)" ] - } } if (current_toolchain == starboard_toolchain) { executable("${actual_target_name}_loader") { @@ -588,13 +582,11 @@ template("shared_library") { deps += [ "//starboard:starboard_install($starboard_toolchain)" ] } } - if (host_os != "win") { - copy("${actual_target_name}_loader_copy") { - forward_variables_from(invoker, [ "testonly" ]) - sources = [ "$root_out_dir/${actual_target_name}_loader" ] - outputs = [ "$root_build_dir/${actual_target_name}_loader" ] - deps = [ ":${actual_target_name}_loader" ] - } + copy("${actual_target_name}_loader_copy") { + forward_variables_from(invoker, [ "testonly" ]) + sources = [ "$root_out_dir/${actual_target_name}_loader" ] + outputs = [ "$root_build_dir/${actual_target_name}_loader" ] + deps = [ ":${actual_target_name}_loader" ] } } } diff --git a/starboard/build/config/modular/BUILD.gn b/starboard/build/config/modular/BUILD.gn index a5e34fda89ec..426daaf69bb7 100644 --- a/starboard/build/config/modular/BUILD.gn +++ b/starboard/build/config/modular/BUILD.gn @@ -28,10 +28,7 @@ config("modular") { "-isystem" + rebase_path("//third_party/musl/arch/generic", root_build_dir), ] - if (host_os != "win") { - # Causes error on windows. clang++: error: unsupported option '-fPIC' for target 'x86_64-pc-windows-msvc' - cflags += [ "-fPIC" ] - } + cflags += [ "-fPIC" ] cflags_cc = [ "-nostdinc++" ] diff --git a/starboard/build/config/starboard_target_type.gni b/starboard/build/config/starboard_target_type.gni index b0eeea6329a6..b29e0abf235d 100644 --- a/starboard/build/config/starboard_target_type.gni +++ b/starboard/build/config/starboard_target_type.gni @@ -39,9 +39,7 @@ template("starboard_platform_target") { } if (target_type == "shared_library") { build_loader = false - if (host_os != "win") { - output_extension = starboard_shared_library_extension - } + output_extension = starboard_shared_library_extension } public_deps = [ "//starboard/client_porting/cwrappers", diff --git a/starboard/build/config/win/BUILD.gn b/starboard/build/config/win/BUILD.gn deleted file mode 100644 index faa461a4d95a..000000000000 --- a/starboard/build/config/win/BUILD.gn +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 2023 The Cobalt Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/config/win/visual_studio_version.gni") - -# TODO(andrewsavage): No way host builds need all these flags -config("host") { - configs = [ ":common" ] -} - -config("common") { - configs = [] - - cflags_cc = [ "/TP" ] - cflags = [ "/Z7" ] - ldflags = [ - "/NXCOMPAT", - "/MANIFEST:NO", - ] - libs = [] - include_dirs = [] - arflags = [] - defines = [ - "_UNICODE", - "UNICODE", - - # min and max collide with std::min and std::max - "NOMINMAX", - ] - - # msvs_base - # OutputDirectory and IntermediateDirectory, maybe CharacterSet - include_dirs += [ - "$wdk_include_path/shared", - "$wdk_include_path/ucrt", - "$wdk_include_path/um", - "$wdk_include_path/winrt", - "$msvc_path/include", - ] - cflags += [ "/EHsc" ] - - # msvs_debug/_devel/etc - ldflags += [ "/INCREMENTAL:NO" ] - if (is_debug) { - cflags += [ - "/Od", - - # Check stack frame validity and check for uninitialized variables at run time. - "/RTC1", - ] - } else { - cflags += [ "/O2" ] - } - - if (!is_gold) { - libs += [ "dbghelp.lib" ] - } - - if (is_debug || is_devel) { - cflags += [ - # Use debug multithreaded library. - "/MDd", - "/GS", - - # Unit tests can have huge object files. - "/bigobj", - ] - } else { - cflags += [ - # Use release multithreaded library. - "/MD", - - # Unreferenced variable. - # Often variables are only referenced in DCHECKs. - "/wd4189", - ] - ldflags += [ - "/OPT:REF", - "/OPT:ICF", - ] - } - - cflags += [ - # Check for buffer overruns. - "/GS", - - # "for" loop's initializer go out of scope after the for loop. - "/Zc:forScope", - - # wchar_t is treated as a built-in type. - "/Zc:wchar_t", - - # Don't send error reports to MS. - "/errorReport:none", - ] - - arflags += [ - # Linking statically with C++/CX library is not recommended. - # TODO: Remove after removing ComponentExtensions - "/ignore:4264", - ] - - cflags += [ - # Allow unused function input parameter. - "/wd4100", - - # Conditional expression is constant. - # Triggers in many legitimate cases, like branching on a constant declared - # in type traits. - "/wd4127", - - # Disable anonymous union warnings. - "/wd4201", - - # 4244 (Level 2) - Implicit conversion from float to int - # 4244 (Level 3) - Implicit conversion from int to something smaller - # than int. - # 4244 (Level 4) - Implicit conversion of types, which may result in - # data loss. - "/wd4244", - - # Class has virtual functions, but destructor is not virtual. - # Far less useful than in GCC because doesn't take into account the fact - # that destructor is not public. - "/wd4265", - - # conversion from 'size_t' to 'int', possible loss of data - "/wd4267", - - # Inconsistent DLL linkage - "/wd4273", - - # Matching delete operator for `new`. 4291 is also ignored by Chromium. - "/wd4291", - - # Double -> float truncation. Not enabled on other compilers. - "/wd4305", - - # cast truncates constant value. - # We do not care. - "/wd4309", - - # casting constant number. - "/wd4310", - - # An rvalue cannot be bound to a non-const reference. - # In previous versions of Visual C++, it was possible to bind an rvalue - # to a non-const reference in a direct initialization. This warning - # is useless as it simply describes proper C++ behavior. - "/wd4350", - - # layout of class may have changed from a previous version of - # the compiler due to better packing of member. We don't care about - # binary compatibility with other compiler versions. - "/wd4371", - - # relative include path contains '..'. - # This occurs in a lot third party libraries and we don't care. - "/wd4464", - - # decorated name length exceeded, name was truncated. - "/wd4503", - - # assignment operator could not be generated. - # This is expected for structs with const members. - "/wd4512", - - # Unreferenced inline function has been removed. - # While detection of dead code is good, this warning triggers in - # third-party libraries which renders it useless. - "/wd4514", - - # Expression before comma has no effect. - # Cannot be used because Microsoft uses _ASSERTE(("message", 0)) trick - # in malloc.h which is included pretty much everywhere. - "/wd4548", - - # Use of noexcept in targets compiled without /EHsc triggers a warning - # "termination on exception is not guaranteed" which we consider benign - # because we don't expect exceptions to cross the boundary of modules - # compiled with /EHsc. - "/wd4577", - - # Copy constructor could not be generated because a base class copy - # constructor is inaccessible. - # This is an expected consequence of using DISALLOW_COPY_AND_ASSIGN(). - "/wd4625", - - # Assignment operator could not be generated because a base class - # assignment operator is inaccessible. - # This is an expected consequence of using DISALLOW_COPY_AND_ASSIGN(). - "/wd4626", - - # Digraphs not supported. - "/wd4628", - - # Sometimes template definitions and declarations are separate and MSVC - # complains when it fails to find the definition on seeing the template. - "/wd4661", - - # Symbol is not defined as a preprocessor macro, replacing with '0'. - # Seems like common practice, used in Windows SDK and gtest. - "/wd4668", - - # Function not inlined. - # It's up to the compiler to decide what to inline. - "/wd4710", - - # Function selected for inline expansion. - # It's up to the compiler to decide what to inline. - "/wd4711", - - # The type and order of elements caused the compiler to add padding - # to the end of a struct. - # Unsurprisingly, most of the structs become larger because of padding - # but it's a universally acceptable price for better performance. - "/wd4820", - - # warning C4828: character '�' in net/dns/dns_names_util_unittest.cc - "/wd4828", - - # Disable static analyzer warning for std::min and std::max with - # objects. - # https://connect.microsoft.com/VisualStudio/feedback/details/783808/static-analyzer-warning-c28285-for-std-min-and-std-max - "/wd28285", - - # Deprecated function warning. - "/wd4996", - - # Compiler warnings introduced after upgrading to Visual Studio 2022. - # Implicit conversion from 'type' to bool. Possible information loss. - "/wd4800", - - # Discarding return value of function with 'nodiscard' attribute. - "/wd4834", - "/wd4858", - - # Unnamed class used in typedef name cannot declare members other than - # non-static data members, member enumerations, or member classes. - "/wd5208", - ] -} diff --git a/starboard/build/toolchain/cobalt_toolchains.gni b/starboard/build/toolchain/cobalt_toolchains.gni index d0f7449f41ca..a3109c408932 100644 --- a/starboard/build/toolchain/cobalt_toolchains.gni +++ b/starboard/build/toolchain/cobalt_toolchains.gni @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/config/win/visual_studio_version.gni") import("//build/toolchain/gcc_toolchain.gni") template("cobalt_clang_toolchain") { @@ -28,23 +27,13 @@ template("cobalt_clang_toolchain") { } assert(defined(native_linker_path), "native_linker_path has to be defined by the platform") - if (host_os != "win") { - prefix = rebase_path("$clang_base_path/bin", root_build_dir) - cc = "$prefix/clang" - cxx = "$prefix/clang++" - ld = native_linker_path - readelf = "readelf" - ar = "${prefix}/llvm-ar" - nm = "nm" - } else { - prefix = llvm_clang_path - cc = "$prefix/clang.exe" - cxx = "$prefix/clang++.exe" - ld = native_linker_path - readelf = "$prefix/llvm-readobj.exe" - ar = "${prefix}/llvm-ar.exe" - nm = "${prefix}/llvm-nm.exe" - } + prefix = rebase_path("$clang_base_path/bin", root_build_dir) + cc = "$prefix/clang" + cxx = "$prefix/clang++" + ld = native_linker_path + readelf = "readelf" + ar = "${prefix}/llvm-ar" + nm = "nm" toolchain_args = { if (defined(invoker.toolchain_args)) { forward_variables_from(invoker.toolchain_args, "*") diff --git a/starboard/build/toolchain/win/BUILD.gn b/starboard/build/toolchain/win/BUILD.gn deleted file mode 100644 index 498db6d52156..000000000000 --- a/starboard/build/toolchain/win/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023 The Cobalt Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/toolchain/win/msvc_toolchain.gni") -import("//starboard/build/toolchain/win/variables.gni") - -msvc_toolchain("x64") { - cl = "$tool_base_path/cl.exe" - lib = "$tool_base_path/lib.exe" - link = "$tool_base_path/link.exe" - asm = "$tool_base_path/ml64.exe" - sys_lib_flags = sys_libpaths - - toolchain_args = { - is_clang = false - current_os = "win" - current_cpu = "x64" - toolchain_config_path = "//starboard/build/config/win:host" - } -} diff --git a/starboard/build/toolchain/win/variables.gni b/starboard/build/toolchain/win/variables.gni deleted file mode 100644 index bec21e0eb454..000000000000 --- a/starboard/build/toolchain/win/variables.gni +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2023 The Cobalt Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/config/win/visual_studio_version.gni") - -tool_base_path = "$msvc_path/bin/HostX64/x64" -common_libpaths = - "/LIBPATH:\"$wdk_lib_path/ucrt/x64\" /LIBPATH:\"$wdk_lib_path/um/x64\"" -sys_libpaths = "/LIBPATH:\"$msvc_path/lib/x64\" " + common_libpaths diff --git a/starboard/common/file.h b/starboard/common/file.h index b599894c89ed..ace1618b9303 100644 --- a/starboard/common/file.h +++ b/starboard/common/file.h @@ -27,13 +27,6 @@ #include "starboard/common/log.h" -#ifdef _WIN32 -#undef open -#undef close -#define open sb_open -#define close sb_close -#endif - namespace starboard { bool FileCanOpen(const char* path, int flags); diff --git a/starboard/common/log.cc b/starboard/common/log.cc index ca5a978c683a..e4cca971a9fe 100644 --- a/starboard/common/log.cc +++ b/starboard/common/log.cc @@ -126,12 +126,6 @@ std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) { return out << wstr.c_str(); } -#if defined(__cplusplus_winrt) -std::ostream& operator<<(std::ostream& out, ::Platform::String ^ str) { - return out << std::wstring(str->Begin(), str->End()); -} -#endif - LogMessage::LogMessage(const char* file, int line, SbLogPriority priority) : priority_(priority), file_(file), line_(line) { Init(file, line); diff --git a/starboard/common/log.h b/starboard/common/log.h index 74b8384bea90..44bed6e42c4f 100644 --- a/starboard/common/log.h +++ b/starboard/common/log.h @@ -59,10 +59,6 @@ std::ostream& operator<<(std::ostream& out, const Stack& stack); std::ostream& operator<<(std::ostream& out, const wchar_t* wstr); std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); -#if defined(__cplusplus_winrt) -inline std::ostream& operator<<(std::ostream& out, ::Platform::String ^ str); -#endif - const SbLogPriority SB_LOG_INFO = kSbLogPriorityInfo; const SbLogPriority SB_LOG_WARNING = kSbLogPriorityWarning; const SbLogPriority SB_LOG_ERROR = kSbLogPriorityError; diff --git a/starboard/egl_and_gles/BUILD.gn b/starboard/egl_and_gles/BUILD.gn index eae19d5799da..41abd132336d 100644 --- a/starboard/egl_and_gles/BUILD.gn +++ b/starboard/egl_and_gles/BUILD.gn @@ -48,9 +48,6 @@ declare_args() { config("egl_and_gles_angle_config") { include_dirs = [ "//third_party/angle/include" ] - if (is_win && enable_d3d11_feature_level_11) { - defines = [ "GL_GLEXT_PROTOTYPES" ] - } } if (gl_type == "angle") { diff --git a/starboard/elf_loader/BUILD.gn b/starboard/elf_loader/BUILD.gn index 3e8635fd0ed5..6d19f20442d2 100644 --- a/starboard/elf_loader/BUILD.gn +++ b/starboard/elf_loader/BUILD.gn @@ -91,7 +91,7 @@ if (sb_is_evergreen_compatible && current_toolchain == starboard_toolchain) { } # TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms. -if (current_toolchain == starboard_toolchain && host_os != "win") { +if (current_toolchain == starboard_toolchain) { target(starboard_level_final_executable_type, "elf_loader_sandbox") { if (cobalt_font_package == "empty") { data_deps = [ "//starboard/content/fonts:copy_font_data" ] @@ -154,7 +154,7 @@ if (sb_is_evergreen_compatible && current_toolchain == starboard_toolchain) { } # TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms. -if (current_toolchain == starboard_toolchain && host_os != "win") { +if (current_toolchain == starboard_toolchain) { target(starboard_level_gtest_target_type, "elf_loader_test") { testonly = true build_loader = false diff --git a/starboard/nplb/posix_compliance/posix_file_open_test.cc b/starboard/nplb/posix_compliance/posix_file_open_test.cc index 6b24e03058be..72bbcf81b816 100644 --- a/starboard/nplb/posix_compliance/posix_file_open_test.cc +++ b/starboard/nplb/posix_compliance/posix_file_open_test.cc @@ -47,20 +47,8 @@ void BasicTest(bool existing, } int fd; -#ifdef _WIN32 - // File mode is set along with O_CREAT flag. - // Windows only supports 1)_S_IREAD, which is mapped to S_IRUSR, 2) _S_IWRITE, - // which is mapped to S_IWUSR, and 3) _S_IREAD | _S_IWRITE. - if (open_flags & O_CREAT && (open_flags == S_IRUSR || open_flags == S_IWUSR || - open_flags == (S_IRUSR | S_IWUSR))) { - fd = open(filename.c_str(), open_flags, mode); - } else { - fd = open(filename.c_str(), open_flags); - } -#else fd = (open_flags & O_CREAT) ? open(filename.c_str(), open_flags, mode) : open(filename.c_str(), open_flags); -#endif if (!expected_success) { EXPECT_FALSE(fd >= 0) << SB_FILE_OPEN_TEST_CONTEXT; diff --git a/starboard/nplb/posix_compliance/posix_socket_set_options_test.cc b/starboard/nplb/posix_compliance/posix_socket_set_options_test.cc index 2eeb5af33724..a8ca6c906d25 100644 --- a/starboard/nplb/posix_compliance/posix_socket_set_options_test.cc +++ b/starboard/nplb/posix_compliance/posix_socket_set_options_test.cc @@ -50,10 +50,7 @@ TEST_P(PosixSocketSetOptionsTest, TryThemAllTCP) { EXPECT_EQ(setsockopt(socket_fd, IPPROTO_TCP, TCP_KEEPALIVE, &period_seconds, sizeof(period_seconds)), 0); -#elif !defined(_WIN32) - // In Windows, the SOL_TCP and TCP_KEEPIDLE options are not available. - // For reference: - // https://stackoverflow.com/questions/8176821/how-to-set-the-keep-alive-interval-for-winsock +#else EXPECT_EQ(setsockopt(socket_fd, SOL_TCP, TCP_KEEPIDLE, &period_seconds, sizeof(period_seconds)), 0); diff --git a/starboard/sabi/x64/windows/sabi-v12.json b/starboard/sabi/x64/windows/sabi-v12.json deleted file mode 100644 index 7a676949e84d..000000000000 --- a/starboard/sabi/x64/windows/sabi-v12.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variables": { - "sb_api_version": 12, - "target_arch": "x64", - "target_arch_sub": "", - "word_size": 64, - "endianness": "little", - "calling_convention": "windows", - "floating_point_abi": "", - "floating_point_fpu": "", - "signedness_of_char": "signed", - "signedness_of_enum": "signed", - "alignment_char": 1, - "alignment_double": 8, - "alignment_float": 4, - "alignment_int": 4, - "alignment_llong": 8, - "alignment_long": 4, - "alignment_pointer": 8, - "alignment_short": 2, - "size_of_char": 1, - "size_of_double": 8, - "size_of_enum": 4, - "size_of_float": 4, - "size_of_int": 4, - "size_of_llong": 8, - "size_of_long": 4, - "size_of_pointer": 8, - "size_of_short": 2 - } -} diff --git a/starboard/sabi/x64/windows/sabi-v13.json b/starboard/sabi/x64/windows/sabi-v13.json deleted file mode 100644 index 90b7eea16425..000000000000 --- a/starboard/sabi/x64/windows/sabi-v13.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variables": { - "sb_api_version": 13, - "target_arch": "x64", - "target_arch_sub": "", - "word_size": 64, - "endianness": "little", - "calling_convention": "windows", - "floating_point_abi": "", - "floating_point_fpu": "", - "signedness_of_char": "signed", - "signedness_of_enum": "signed", - "alignment_char": 1, - "alignment_double": 8, - "alignment_float": 4, - "alignment_int": 4, - "alignment_llong": 8, - "alignment_long": 4, - "alignment_pointer": 8, - "alignment_short": 2, - "size_of_char": 1, - "size_of_double": 8, - "size_of_enum": 4, - "size_of_float": 4, - "size_of_int": 4, - "size_of_llong": 8, - "size_of_long": 4, - "size_of_pointer": 8, - "size_of_short": 2 - } -} diff --git a/starboard/sabi/x64/windows/sabi-v14.json b/starboard/sabi/x64/windows/sabi-v14.json deleted file mode 100644 index f2962368c71f..000000000000 --- a/starboard/sabi/x64/windows/sabi-v14.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variables": { - "sb_api_version": 14, - "target_arch": "x64", - "target_arch_sub": "", - "word_size": 64, - "endianness": "little", - "calling_convention": "windows", - "floating_point_abi": "", - "floating_point_fpu": "", - "signedness_of_char": "signed", - "signedness_of_enum": "signed", - "alignment_char": 1, - "alignment_double": 8, - "alignment_float": 4, - "alignment_int": 4, - "alignment_llong": 8, - "alignment_long": 4, - "alignment_pointer": 8, - "alignment_short": 2, - "size_of_char": 1, - "size_of_double": 8, - "size_of_enum": 4, - "size_of_float": 4, - "size_of_int": 4, - "size_of_llong": 8, - "size_of_long": 4, - "size_of_pointer": 8, - "size_of_short": 2 - } -} diff --git a/starboard/sabi/x64/windows/sabi-v15.json b/starboard/sabi/x64/windows/sabi-v15.json deleted file mode 100644 index 837a30caddac..000000000000 --- a/starboard/sabi/x64/windows/sabi-v15.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variables": { - "sb_api_version": 15, - "target_arch": "x64", - "target_arch_sub": "", - "word_size": 64, - "endianness": "little", - "calling_convention": "windows", - "floating_point_abi": "", - "floating_point_fpu": "", - "signedness_of_char": "signed", - "signedness_of_enum": "signed", - "alignment_char": 1, - "alignment_double": 8, - "alignment_float": 4, - "alignment_int": 4, - "alignment_llong": 8, - "alignment_long": 4, - "alignment_pointer": 8, - "alignment_short": 2, - "size_of_char": 1, - "size_of_double": 8, - "size_of_enum": 4, - "size_of_float": 4, - "size_of_int": 4, - "size_of_llong": 8, - "size_of_long": 4, - "size_of_pointer": 8, - "size_of_short": 2 - } -} diff --git a/starboard/sabi/x64/windows/sabi-v16.json b/starboard/sabi/x64/windows/sabi-v16.json deleted file mode 100644 index 8ebe80678258..000000000000 --- a/starboard/sabi/x64/windows/sabi-v16.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variables": { - "sb_api_version": 16, - "target_arch": "x64", - "target_arch_sub": "", - "word_size": 64, - "endianness": "little", - "calling_convention": "windows", - "floating_point_abi": "", - "floating_point_fpu": "", - "signedness_of_char": "signed", - "signedness_of_enum": "signed", - "alignment_char": 1, - "alignment_double": 8, - "alignment_float": 4, - "alignment_int": 4, - "alignment_llong": 8, - "alignment_long": 4, - "alignment_pointer": 8, - "alignment_short": 2, - "size_of_char": 1, - "size_of_double": 8, - "size_of_enum": 4, - "size_of_float": 4, - "size_of_int": 4, - "size_of_llong": 8, - "size_of_long": 4, - "size_of_pointer": 8, - "size_of_short": 2 - } -} diff --git a/starboard/sabi/x64/windows/sabi-v17.json b/starboard/sabi/x64/windows/sabi-v17.json deleted file mode 100644 index 1731dabde578..000000000000 --- a/starboard/sabi/x64/windows/sabi-v17.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variables": { - "sb_api_version": 17, - "target_arch": "x64", - "target_arch_sub": "", - "word_size": 64, - "endianness": "little", - "calling_convention": "windows", - "floating_point_abi": "", - "floating_point_fpu": "", - "signedness_of_char": "signed", - "signedness_of_enum": "signed", - "alignment_char": 1, - "alignment_double": 8, - "alignment_float": 4, - "alignment_int": 4, - "alignment_llong": 8, - "alignment_long": 4, - "alignment_pointer": 8, - "alignment_short": 2, - "size_of_char": 1, - "size_of_double": 8, - "size_of_enum": 4, - "size_of_float": 4, - "size_of_int": 4, - "size_of_llong": 8, - "size_of_long": 4, - "size_of_pointer": 8, - "size_of_short": 2 - } -} diff --git a/starboard/shared/starboard/player/filter/testing/BUILD.gn b/starboard/shared/starboard/player/filter/testing/BUILD.gn index 1253e27125d5..ec3bed861191 100644 --- a/starboard/shared/starboard/player/filter/testing/BUILD.gn +++ b/starboard/shared/starboard/player/filter/testing/BUILD.gn @@ -50,22 +50,20 @@ if (current_toolchain == starboard_toolchain) { [ "//starboard/shared/starboard/player:player_download_test_data" ] } - if (host_os != "win") { - target(final_executable_type, "player_filter_benchmarks") { - testonly = true + target(final_executable_type, "player_filter_benchmarks") { + testonly = true - sources = [ - "//starboard/common/benchmark_main.cc", - "audio_decoder_benchmark.cc", - ] + sources = [ + "//starboard/common/benchmark_main.cc", + "audio_decoder_benchmark.cc", + ] - public_deps = [ - ":test_util", - "//third_party/google_benchmark", - ] + public_deps = [ + ":test_util", + "//third_party/google_benchmark", + ] - deps = cobalt_platform_dependencies - } + deps = cobalt_platform_dependencies } static_library("test_util") { diff --git a/starboard/shared/uwp/system_get_device_type.cc b/starboard/shared/uwp/system_get_device_type.cc deleted file mode 100644 index e1b941b08e16..000000000000 --- a/starboard/shared/uwp/system_get_device_type.cc +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2017 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#include - -#include "starboard/common/log.h" -#include "starboard/shared/win32/wchar_utils.h" - -using Windows::System::Profile::AnalyticsInfo; -using Windows::System::Profile::AnalyticsVersionInfo; - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - AnalyticsVersionInfo ^ version_info = AnalyticsInfo::VersionInfo; - std::string family = starboard::shared::win32::platformStringToString( - version_info->DeviceFamily); - - if (family.compare("Windows.Desktop") == 0) { - return kSbSystemDeviceTypeDesktopPC; - } - if (family.compare("Windows.Xbox") == 0) { - return kSbSystemDeviceTypeGameConsole; - } - SB_NOTREACHED(); - return kSbSystemDeviceTypeUnknown; -} - -#endif diff --git a/starboard/shared/win32/system_get_device_type.cc b/starboard/shared/win32/system_get_device_type.cc deleted file mode 100644 index 5e5a4647c717..000000000000 --- a/starboard/shared/win32/system_get_device_type.cc +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#include - -#include "starboard/common/log.h" -#include "starboard/shared/win32/wchar_utils.h" - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeDesktopPC; -} - -#endif diff --git a/starboard/stub/platform_configuration/configuration.gni b/starboard/stub/platform_configuration/configuration.gni index ed4cdd311c72..75111209bae5 100644 --- a/starboard/stub/platform_configuration/configuration.gni +++ b/starboard/stub/platform_configuration/configuration.gni @@ -26,6 +26,4 @@ pedantic_warnings_config_path = no_pedantic_warnings_config_path = "//starboard/stub/platform_configuration:no_pedantic_warnings" -assert(host_os != "win", "Stub build is not (yet) supported on windows host") - v8_enable_webassembly = true