Skip to content

Commit

Permalink
Merge branch 'main' into iamf-decoder
Browse files Browse the repository at this point in the history
  • Loading branch information
@osagie98
osagie98 authored Sep 24, 2024
2 parents 3efad63 + 3fb4b2d commit 945bedd
Show file tree
Hide file tree
Showing 1,491 changed files with 1,675 additions and 61,429 deletions.
5 changes: 4 additions & 1 deletion .github/actions/docker/action.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,11 @@ runs:
echo "DOCKER_TAG=${docker_tag}" >> $GITHUB_ENV
shell: bash
- name: Set up Cloud SDK
if: ${{ (steps.changed-files.outputs.any_changed == 'true') && (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.fork) }}
uses: isarkis/setup-gcloud@40dce7857b354839efac498d3632050f568090b6 # v1.1.1
- name: Configure Docker auth for GCloud
shell: bash
run: |
gcloud auth configure-docker
- name: Set Docker Tag
id: set-docker-tag-presubmit-fork
env:
Expand Down
20 changes: 0 additions & 20 deletions .github/config/evergreen-arm-hardfp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
},
"platforms": [
"evergreen-arm-hardfp",
"evergreen-arm-hardfp-sbversion-15",
"evergreen-arm-hardfp-sbversion-16",
"evergreen-arm-hardfp-sbversion-17"
],
"includes": [
Expand All @@ -27,24 +25,6 @@
"evergreen_loader_extra_gn_arguments": "use_asan=false is_clang=false",
"dimension": "release_version=regex:10.*"
},
{
"name":"sbversion-15",
"platform":"evergreen-arm-hardfp-sbversion-15",
"target_platform":"evergreen-arm-hardfp",
"target_cpu":"target_cpu=\\\"arm\\\"",
"extra_gn_arguments":"use_asan=false",
"evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
"sb_api_version": "15"
},
{
"name":"sbversion-16",
"platform":"evergreen-arm-hardfp-sbversion-16",
"target_platform":"evergreen-arm-hardfp",
"target_cpu":"target_cpu=\\\"arm\\\"",
"extra_gn_arguments":"use_asan=false",
"evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
"sb_api_version": "16"
},
{
"name":"sbversion-17",
"platform":"evergreen-arm-hardfp-sbversion-17",
Expand Down
20 changes: 0 additions & 20 deletions .github/config/evergreen-arm-softfp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
},
"platforms": [
"evergreen-arm-softfp",
"evergreen-arm-softfp-sbversion-15",
"evergreen-arm-softfp-sbversion-16",
"evergreen-arm-softfp-sbversion-17"
],
"includes": [
Expand All @@ -26,24 +24,6 @@
"extra_gn_arguments":"use_asan=false",
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
},
{
"name":"sbversion-15",
"platform":"evergreen-arm-softfp-sbversion-15",
"target_platform":"evergreen-arm-softfp",
"target_cpu":"target_cpu=\\\"arm\\\"",
"extra_gn_arguments":"use_asan=false",
"sb_api_version":"15",
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
},
{
"name":"sbversion-16",
"platform":"evergreen-arm-softfp-sbversion-16",
"target_platform":"evergreen-arm-softfp",
"target_cpu":"target_cpu=\\\"arm\\\"",
"extra_gn_arguments":"use_asan=false",
"sb_api_version":"16",
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
},
{
"name":"sbversion-17",
"platform":"evergreen-arm-softfp-sbversion-17",
Expand Down
20 changes: 0 additions & 20 deletions .github/config/evergreen-arm64.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"evergreen_loader": "android-arm64",
"platforms": [
"evergreen-arm64",
"evergreen-arm64-sbversion-15",
"evergreen-arm64-sbversion-16",
"evergreen-arm64-sbversion-17"
],
"includes": [
Expand All @@ -16,24 +14,6 @@
"extra_gn_arguments":"use_asan=false",
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
},
{
"name":"sbversion-15",
"platform":"evergreen-arm64-sbversion-15",
"target_platform":"evergreen-arm64",
"target_cpu":"target_cpu=\\\"arm64\\\"",
"extra_gn_arguments":"use_asan=false",
"sb_api_version":"15",
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
},
{
"name":"sbversion-16",
"platform":"evergreen-arm64-sbversion-16",
"target_platform":"evergreen-arm64",
"target_cpu":"target_cpu=\\\"arm64\\\"",
"extra_gn_arguments":"use_asan=false",
"sb_api_version":"16",
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
},
{
"name":"sbversion-17",
"platform":"evergreen-arm64-sbversion-17",
Expand Down
18 changes: 0 additions & 18 deletions .github/config/evergreen-x64.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt", "evergreen"],
"platforms": [
"evergreen-x64",
"evergreen-x64-sbversion-15",
"evergreen-x64-sbversion-16",
"evergreen-x64-sbversion-17"
],
"includes": [
Expand All @@ -17,22 +15,6 @@
"target_cpu":"target_cpu=\\\"x64\\\"",
"extra_gn_arguments":"use_asan=false"
},
{
"name":"sbversion-15",
"platform":"evergreen-x64-sbversion-15",
"target_platform":"evergreen-x64",
"target_cpu":"target_cpu=\\\"x64\\\"",
"extra_gn_arguments":"use_asan=false",
"sb_api_version":"15"
},
{
"name":"sbversion-16",
"platform":"evergreen-x64-sbversion-16",
"target_platform":"evergreen-x64",
"target_cpu":"target_cpu=\\\"x64\\\"",
"extra_gn_arguments":"use_asan=false",
"sb_api_version":"16"
},
{
"name":"sbversion-17",
"platform":"evergreen-x64-sbversion-17",
Expand Down
14 changes: 0 additions & 14 deletions .github/config/linux.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
"linux-x64x11",
"linux-x64x11-egl",
"linux-x64x11-skia",
"linux-x64x11-sbversion-15",
"linux-x64x11-sbversion-16",
"linux-x64x11-sbversion-17"
],
"includes": [
Expand All @@ -27,18 +25,6 @@
"platform":"linux-x64x11-skia",
"target_platform":"linux-x64x11-skia"
},
{
"name":"sbversion-15",
"platform":"linux-x64x11-sbversion-15",
"target_platform":"linux-x64x11",
"sb_api_version":"15"
},
{
"name":"sbversion-16",
"platform":"linux-x64x11-sbversion-16",
"target_platform":"linux-x64x11",
"sb_api_version":"16"
},
{
"name":"sbversion-17",
"platform":"linux-x64x11-sbversion-17",
Expand Down
18 changes: 0 additions & 18 deletions .github/config/raspi-2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
},
"platforms": [
"raspi-2",
"raspi-2-sbversion-15",
"raspi-2-sbversion-16",
"raspi-2-sbversion-17"
],
"includes": [
Expand All @@ -25,22 +23,6 @@
"target_cpu":"target_cpu=\\\"arm\\\"",
"extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false"
},
{
"name":"sbversion-15",
"platform":"raspi-2-sbversion-15",
"target_platform":"raspi-2",
"target_cpu":"target_cpu=\\\"arm\\\"",
"extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
"sb_api_version": "15"
},
{
"name":"sbversion-16",
"platform":"raspi-2-sbversion-16",
"target_platform":"raspi-2",
"target_cpu":"target_cpu=\\\"arm\\\"",
"extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
"sb_api_version": "16"
},
{
"name":"sbversion-17",
"platform":"raspi-2-sbversion-17",
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/unit_test_report.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ name: Upload Unit Test Results
on:
workflow_run:
workflows:
- android
- evergreen
- linux
- win32
- raspi-2
types:
- completed

Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ repos:
(?x)^(
(internal/)?starboard/[^/]+/i18n/|
cobalt/content/licenses/|
cobalt/content/ssl/|
cobalt/fetch/embedded_scripts|
cobalt/streams/embedded_scripts|
cobalt/loader/cors_preflight.cc|
internal/cobalt/browser/splash_screen/youtube_splash_screen.html|
internal/starboard/shared/playstation/storage_internal.cc|
starboard/content/ssl/certs/|
starboard/loader_app/app_key_test.cc|
starboard/shared/starboard/player/testdata|
starboard/shared/win32/media_transform.cc
Expand Down Expand Up @@ -176,7 +176,7 @@ repos:
always_run: true
stages: [push]
additional_dependencies: [certifi]
args: [-m, unittest, cobalt/tools/download_from_gcs_test.py]
args: [-m, unittest, starboard/tools/download_from_gcs_test.py]
- id: test-python3-compatibility
name: Test Python 3 Compatibility
description: Checks that scripts can be run in Python 3
Expand Down
12 changes: 9 additions & 3 deletions base/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,10 @@ component("base") {
}

if (is_starboard && current_toolchain != host_toolchain) {
deps += [ "//starboard:starboard_group" ]
deps += [
"//starboard/common",
"//starboard:starboard_group"
]
}

# `raw_ptr` cannot be made a component due to CRT symbol issues.
Expand Down Expand Up @@ -2702,7 +2705,10 @@ static_library("base_static") {
deps = [ "//build:chromeos_buildflags" ]

if (is_starboard && current_toolchain != host_toolchain) {
deps += [ "//starboard:starboard_group" ]
deps += [
"//starboard/common",
"//starboard:starboard_group"
]
}

if (is_win) {
Expand Down Expand Up @@ -3667,7 +3673,7 @@ test("base_unittests") {
if (is_starboard){
data_deps += [
":base_unittests_bundle_data",
"//cobalt/network:copy_ssl_certificates",
"//starboard/content/ssl:copy_ssl_certificates",
]
}

Expand Down
1 change: 0 additions & 1 deletion base/files/file.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "base/timer/elapsed_timer.h"
#include "base/trace_event/base_tracing.h"
#include "build/build_config.h"

#if defined(STARBOARD)
#include "starboard/types.h"
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
Expand Down
1 change: 0 additions & 1 deletion base/files/file_enumerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#if defined(STARBOARD)
#include <sys/stat.h>
#include <unistd.h>
#include "starboard/file.h"
#elif BUILDFLAG(IS_WIN)
#include "base/win/windows_types.h"
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
Expand Down
3 changes: 0 additions & 3 deletions base/files/file_enumerator_starboard.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
#include "starboard/common/log.h"
#include "starboard/common/string.h"
#include "starboard/configuration_constants.h"
#include "starboard/directory.h"
#include "starboard/file.h"
#include "starboard/memory.h"

namespace base {

Expand Down
1 change: 0 additions & 1 deletion base/files/file_starboard.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "base/strings/stringprintf.h"
#include "base/threading/thread_restrictions.h"
#include "starboard/common/metrics/stats_tracker.h"
#include "starboard/file.h"

namespace base {

Expand Down
12 changes: 11 additions & 1 deletion base/files/file_util_starboard.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include "base/time/time.h"
#include "starboard/configuration_constants.h"
#include "starboard/common/file.h"
#include "starboard/directory.h"
#include "base/strings/strcat.h"
#include "starboard/system.h"

Expand Down Expand Up @@ -477,6 +476,17 @@ FilePath MakeAbsoluteFilePath(const FilePath& input) {
return input;
}

bool SetNonBlocking(int fd) {
const int flags = fcntl(fd, F_GETFL);
if (flags == -1)
return false;
if (flags & O_NONBLOCK)
return true;
if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1)
return false;
return true;
}

namespace internal {

bool MoveUnsafe(const FilePath& from_path, const FilePath& to_path) {
Expand Down
2 changes: 1 addition & 1 deletion base/files/memory_mapped_file_starboard.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <fcntl.h>
#include <stddef.h>
#include <stdint.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
Expand All @@ -27,7 +28,6 @@
#include "base/threading/scoped_blocking_call.h"
#include "build/build_config.h"
#include "starboard/extension/memory_mapped_file.h"
#include "starboard/memory.h"

namespace base {

Expand Down
4 changes: 0 additions & 4 deletions base/files/platform_file.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
#include "base/files/scoped_file.h"
#include "build/build_config.h"

#if defined(STARBOARD)
#include "starboard/file.h"
#endif

#if BUILDFLAG(IS_WIN)
#include "base/win/scoped_handle.h"
#include "base/win/windows_types.h"
Expand Down
1 change: 0 additions & 1 deletion base/files/scoped_file.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "build/build_config.h"

#if defined(STARBOARD)
#include "starboard/file.h"
#include "starboard/types.h"
#include "starboard/common/file.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion base/logging.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include "starboard/common/time.h"
#include "starboard/configuration.h"
#include "starboard/configuration_constants.h"
#include "starboard/file.h"
#include "starboard/system.h"
typedef int* FileHandle;
typedef pthread_mutex_t MutexHandle;
Expand Down
1 change: 0 additions & 1 deletion base/memory/platform_shared_memory_handle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "base/files/scoped_file.h"
#elif defined(STARBOARD)
#include "base/files/scoped_file.h"
#include "starboard/file.h"
#endif

namespace base::subtle {
Expand Down
Loading

0 comments on commit 945bedd

Please sign in to comment.