Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/cvd/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ build --per_file_copt=cuttlefish/host/frontend/webrtc/libcommon/connection_contr
build --per_file_copt=cuttlefish/host/frontend/webrtc/libcommon/utils\.cpp$@-Wno-thread-safety-reference-return
build --per_file_copt=cuttlefish/host/frontend/webrtc/libcommon/utils\.h$@-Wno-thread-safety-reference-return
build --per_file_copt=cuttlefish/host/frontend/webrtc/libdevice/data_channels\.cpp$@-Wno-thread-safety-reference-return
build --per_file_copt=cuttlefish/host/frontend/webrtc/.*\.(cpp|h)$@-Wno-nullability-completeness
# files with warnings that come from generated files either directly or indirectly through their includes
build --per_file_copt=.*/cuttlefish/host/commands/casimir_control_server/casimir_control\.grpc\.pb\.cc$@-Wno-deprecated-declarations
build --per_file_copt=.*/cuttlefish/host/commands/casimir_control_server/casimir_control\.grpc\.pb\.h$@-Wno-deprecated-declarations
Expand Down
1 change: 1 addition & 0 deletions base/cvd/build_external/build_external.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ include("//build_external/rules_m4:rules_m4.MODULE.bazel")
include("//build_external/rules_rust:rules_rust.MODULE.bazel")
include("//build_external/sandboxed_api:sandboxed_api.MODULE.bazel")
include("//build_external/selinux:selinux.MODULE.bazel")
include("//build_external/sframe:sframe.MODULE.bazel")
include("//build_external/spirv_headers:spirv_headers.MODULE.bazel")
include("//build_external/spirv_tools:spirv_tools.MODULE.bazel")
include("//build_external/swiftshader:swiftshader.MODULE.bazel")
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/build_external/dav1d/BUILD.dav1d.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")

package(default_visibility = ["//visibility:public"])

# dav1d 1.5.3 AV1 decoder (BSD-2-Clause). Pure C, no ASM, 8-bit only.
# dav1d 1.5.4 AV1 decoder (BSD-2-Clause). Pure C, no ASM, 8-bit only.
#
# Internal headers (include/common/, include/compat/) are moved into
# src/ by patch_cmds in dav1d.MODULE.bazel to avoid leaking -isystem
Expand Down
23 changes: 12 additions & 11 deletions base/cvd/build_external/dav1d/dav1d.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ http_archive = use_repo_rule(
http_archive(
name = "dav1d",
build_file = "@//build_external/dav1d:BUILD.dav1d.bazel",
strip_prefix = "dav1d-1.5.4",
urls = [
"https://mirrors.ocf.berkeley.edu/videolan-ftp/dav1d/1.5.4/dav1d-1.5.4.tar.xz",
"https://ftp.osuosl.org/pub/videolan/dav1d/1.5.4/dav1d-1.5.4.tar.xz",
"https://downloads.videolan.org/pub/videolan/dav1d/1.5.4/dav1d-1.5.4.tar.xz",
],
sha256 = "686616b7c69eb88d44459391ab25cac13b6647a3b288835c5784e71c1514a5c5",
patch_cmds = [
# Generate config.h with a dav1d-specific name to avoid
# shadowing other libraries' config.h (e.g., libsrtp2) via
Expand Down Expand Up @@ -39,7 +46,7 @@ ENDOFFILE""",
"""cat > dav1d_vcs_version.h << 'ENDOFFILE'
#ifndef DAV1D_VCS_VERSION_H_
#define DAV1D_VCS_VERSION_H_
#define DAV1D_VERSION "1.5.3"
#define DAV1D_VERSION "1.5.4"
#endif
ENDOFFILE""",
# Generate version.h in the public headers directory
Expand All @@ -60,17 +67,11 @@ ENDOFFILE""",
# Patch #include "common/..." to #include "src/common/..."
# in all source and header files under src/ (including the
# just-moved src/common/ headers themselves).
"find src -name '*.c' -o -name '*.h' | xargs sed -i 's|#include \"common/|#include \"src/common/|g'",
"find src -name '*.c' -o -name '*.h' | xargs sed -i.bak 's|#include \"common/|#include \"src/common/|g'",
# Rename config.h and vcs_version.h includes to the
# dav1d-prefixed names to match the generated files above.
"find src -name '*.c' -o -name '*.h' | xargs sed -i 's|#include \"config.h\"|#include \"dav1d_config.h\"|g'",
"find src -name '*.c' -o -name '*.h' | xargs sed -i 's|#include \"vcs_version.h\"|#include \"dav1d_vcs_version.h\"|g'",
],
sha256 = "732010aa5ef461fa93355ed2c6c5fedb48ddc4b74e697eaabe8907eaeb943011",
strip_prefix = "dav1d-1.5.3",
urls = [
"https://mirrors.ocf.berkeley.edu/videolan-ftp/dav1d/1.5.3/dav1d-1.5.3.tar.xz",
"https://ftp.osuosl.org/pub/videolan/dav1d/1.5.3/dav1d-1.5.3.tar.xz",
"https://downloads.videolan.org/pub/videolan/dav1d/1.5.3/dav1d-1.5.3.tar.xz",
"find src -name '*.c' -o -name '*.h' | xargs sed -i.bak 's|#include \"config.h\"|#include \"dav1d_config.h\"|g'",
"find src -name '*.c' -o -name '*.h' | xargs sed -i.bak 's|#include \"vcs_version.h\"|#include \"dav1d_vcs_version.h\"|g'",
"find src -name '*.bak' -delete",
],
)
25 changes: 12 additions & 13 deletions base/cvd/build_external/libsrtp2/BUILD.libsrtp2.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ package(
cc_library(
name = "libsrtp2",
srcs = [
"crypto/cipher/aes.c",
"crypto/cipher/aes_icm.c",
"crypto/cipher/aes_gcm_ossl.c",
"crypto/cipher/aes_icm_ossl.c",
"crypto/cipher/cipher.c",
"crypto/cipher/cipher_test_cases.c",
"crypto/cipher/null_cipher.c",
"crypto/hash/auth.c",
"crypto/hash/hmac.c",
"crypto/hash/auth_test_cases.c",
"crypto/hash/hmac_ossl.c",
"crypto/hash/null_auth.c",
"crypto/hash/sha1.c",
"crypto/kernel/alloc.c",
"crypto/kernel/crypto_kernel.c",
"crypto/kernel/err.c",
"crypto/kernel/key.c",
"crypto/math/datatypes.c",
"crypto/math/stat.c",
"crypto/replay/rdb.c",
"crypto/replay/rdbx.c",
"crypto/replay/ut_sim.c",
"srtp/ekt.c",
"srtp/srtp.c",
],
hdrs = [
"crypto/cipher/cipher_test_cases.h",
"crypto/hash/auth_test_cases.h",
"crypto/include/aes.h",
"crypto/include/aes_gcm.h",
"crypto/include/aes_icm.h",
Expand All @@ -43,29 +43,28 @@ cc_library(
"crypto/include/crypto_types.h",
"crypto/include/datatypes.h",
"crypto/include/err.h",
"crypto/include/hmac.h",
"crypto/include/integers.h",
"crypto/include/key.h",
"crypto/include/null_auth.h",
"crypto/include/null_cipher.h",
"crypto/include/rdb.h",
"crypto/include/rdbx.h",
"crypto/include/sha1.h",
"crypto/include/stat.h",
"include/ekt.h",
"include/getopt_s.h",
"include/srtp.h",
"include/srtp_priv.h",
"include/ut_sim.h",
"include/stream_list_priv.h",
],
defines = [
"GCM",
"HAVE_CONFIG_H",
"LIBSRTP_HAVE_CRYPTEX",
"OPENSSL",
],
includes = [
"crypto/include",
"include",
],
deps = [
"@//build_external/libsrtp2:libsrtp2_config",
"@boringssl//:crypto",
],
)
4 changes: 2 additions & 2 deletions base/cvd/build_external/libsrtp2/crypto/include/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
#define PACKAGE_NAME "libsrtp2"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libsrtp2 2.4.0-pre"
#define PACKAGE_STRING "libsrtp2 2.8.1"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libsrtp2"
Expand All @@ -161,7 +161,7 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "2.4.0-pre"
#define PACKAGE_VERSION "2.8.1"

/* The size of `unsigned long', as computed by sizeof. */
#define SIZEOF_UNSIGNED_LONG 8
Expand Down
3 changes: 1 addition & 2 deletions base/cvd/build_external/libsrtp2/libsrtp2.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g
git_repository(
name = "libsrtp2",
build_file = "@//build_external/libsrtp2:BUILD.libsrtp2.bazel",
# This is quite old, but it's what libwebrtc depends on
commit = "860492290f7d1f25e2bd45da6471bfd4cd4d7add",
commit = "6ff02afa8d2dc3f2e8896af391d137c1c66ff6fa",
remote = "https://github.com/cisco/libsrtp",
)
4 changes: 4 additions & 0 deletions base/cvd/build_external/libvpx/BUILD.libvpx.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ libvpx_arm64_neon_dotprod_c_srcs = [
"vpx_dsp/arm/sad4d_neon_dotprod.c",
"vpx_dsp/arm/sad_neon_dotprod.c",
"vpx_dsp/arm/sse_neon_dotprod.c",
"vpx_dsp/arm/subpel_variance_neon_dotprod.c",
"vpx_dsp/arm/variance_neon_dotprod.c",
"vpx_dsp/arm/vpx_convolve8_neon_dotprod.c",
]
Expand Down Expand Up @@ -292,6 +293,7 @@ libvpx_x86_64_avx2_c_srcs = [
"vpx_dsp/x86/avg_intrin_avx2.c",
"vpx_dsp/x86/avg_pred_avx2.c",
"vpx_dsp/x86/highbd_convolve_avx2.c",
"vpx_dsp/x86/highbd_intrapred_intrin_avx2.c",
"vpx_dsp/x86/highbd_quantize_intrin_avx2.c",
"vpx_dsp/x86/highbd_sad4d_avx2.c",
"vpx_dsp/x86/highbd_sad_avx2.c",
Expand All @@ -307,7 +309,9 @@ libvpx_x86_64_avx2_c_srcs = [
]

libvpx_x86_64_avx512_c_srcs = [
"vpx_dsp/x86/highbd_intrapred_intrin_avx512.c",
"vpx_dsp/x86/sad4d_avx512.c",
"vpx_dsp/x86/sad_avx512.c",
]

libvpx_x86_64_c_srcs = libvpx_generic_c_srcs + [
Expand Down
Loading
Loading