From 7487ce5aa8b6df4007f5b1c0496396c56606f0cb Mon Sep 17 00:00:00 2001 From: Fang Yu Date: Fri, 7 Dec 2018 17:03:39 -0800 Subject: [PATCH] Manually copy changes from output generated by 'moe test' --- external_build_files/curl.BUILD | 584 ++++++++++++++++++ external_build_files/zlib.BUILD | 48 ++ media_cas_packager_sdk/internal/BUILD | 28 +- media_cas_packager_sdk/public/BUILD | 30 +- .../public/wv_cas_key_fetcher.cc | 2 +- .../public/wv_cas_key_fetcher.h | 2 +- .../public/wv_cas_key_fetcher_test.cc | 2 +- 7 files changed, 664 insertions(+), 32 deletions(-) create mode 100755 external_build_files/curl.BUILD create mode 100755 external_build_files/zlib.BUILD diff --git a/external_build_files/curl.BUILD b/external_build_files/curl.BUILD new file mode 100755 index 0000000..3c912a3 --- /dev/null +++ b/external_build_files/curl.BUILD @@ -0,0 +1,584 @@ +################################################################################ +# Copyright 2018 Google LLC. +# +# This software is licensed under the terms defined in the Widevine Master +# License Agreement. For a copy of this agreement, please contact +# widevine-licensing@google.com. +################################################################################ + +# Build file for curl. + +exports_files(["COPYING"]) + +cc_library( + name = "curl", + srcs = [ + "include/curl_config.h", # generated by genrule below + "lib/amigaos.c", + "lib/amigaos.h", + "lib/arpa_telnet.h", + "lib/asyn-ares.c", + "lib/asyn-thread.c", + "lib/asyn.h", + "lib/base64.c", + "lib/config-amigaos.h", + "lib/config-dos.h", + "lib/config-mac.h", + "lib/config-os400.h", + "lib/config-riscos.h", + "lib/config-symbian.h", + "lib/config-tpf.h", + "lib/config-vxworks.h", + "lib/config-win32.h", + "lib/config-win32ce.h", + "lib/conncache.c", + "lib/conncache.h", + "lib/connect.c", + "lib/connect.h", + "lib/content_encoding.c", + "lib/content_encoding.h", + "lib/cookie.c", + "lib/cookie.h", + "lib/curl_addrinfo.c", + "lib/curl_addrinfo.h", + "lib/curl_base64.h", + "lib/curl_ctype.c", + "lib/curl_ctype.h", + "lib/curl_des.c", + "lib/curl_des.h", + "lib/curl_endian.c", + "lib/curl_endian.h", + "lib/curl_fnmatch.c", + "lib/curl_fnmatch.h", + "lib/curl_gethostname.c", + "lib/curl_gethostname.h", + "lib/curl_gssapi.c", + "lib/curl_gssapi.h", + "lib/curl_hmac.h", + "lib/curl_ldap.h", + "lib/curl_md4.h", + "lib/curl_md5.h", + "lib/curl_memory.h", + "lib/curl_memrchr.c", + "lib/curl_memrchr.h", + "lib/curl_multibyte.c", + "lib/curl_multibyte.h", + "lib/curl_ntlm_core.c", + "lib/curl_ntlm_core.h", + "lib/curl_ntlm_wb.c", + "lib/curl_ntlm_wb.h", + "lib/curl_path.c", + "lib/curl_path.h", + "lib/curl_printf.h", + "lib/curl_range.c", + "lib/curl_range.h", + "lib/curl_rtmp.c", + "lib/curl_rtmp.h", + "lib/curl_sasl.c", + "lib/curl_sasl.h", + "lib/curl_sec.h", + "lib/curl_setup.h", + "lib/curl_setup_once.h", + "lib/curl_sha256.h", + "lib/curl_sspi.c", + "lib/curl_sspi.h", + "lib/curl_threads.c", + "lib/curl_threads.h", + "lib/curlx.h", + "lib/dict.c", + "lib/dict.h", + "lib/doh.c", + "lib/doh.h", + "lib/dotdot.c", + "lib/dotdot.h", + "lib/easy.c", + "lib/easyif.h", + "lib/escape.c", + "lib/escape.h", + "lib/file.c", + "lib/file.h", + "lib/fileinfo.c", + "lib/fileinfo.h", + "lib/formdata.c", + "lib/formdata.h", + "lib/ftp.c", + "lib/ftp.h", + "lib/ftplistparser.c", + "lib/ftplistparser.h", + "lib/getenv.c", + "lib/getinfo.c", + "lib/getinfo.h", + "lib/gopher.c", + "lib/gopher.h", + "lib/hash.c", + "lib/hash.h", + "lib/hmac.c", + "lib/hostasyn.c", + "lib/hostcheck.c", + "lib/hostcheck.h", + "lib/hostip.c", + "lib/hostip.h", + "lib/hostip4.c", + "lib/hostip6.c", + "lib/hostsyn.c", + "lib/http.c", + "lib/http.h", + "lib/http2.c", + "lib/http2.h", + "lib/http_chunks.c", + "lib/http_chunks.h", + "lib/http_digest.c", + "lib/http_digest.h", + "lib/http_negotiate.c", + "lib/http_negotiate.h", + "lib/http_ntlm.c", + "lib/http_ntlm.h", + "lib/http_proxy.c", + "lib/http_proxy.h", + "lib/idn_win32.c", + "lib/if2ip.c", + "lib/if2ip.h", + "lib/imap.c", + "lib/imap.h", + "lib/inet_ntop.c", + "lib/inet_ntop.h", + "lib/inet_pton.c", + "lib/inet_pton.h", + "lib/krb5.c", + "lib/ldap.c", + "lib/llist.c", + "lib/llist.h", + "lib/md4.c", + "lib/md5.c", + "lib/memdebug.c", + "lib/memdebug.h", + "lib/mime.c", + "lib/mime.h", + "lib/mprintf.c", + "lib/multi.c", + "lib/multihandle.h", + "lib/multiif.h", + "lib/netrc.c", + "lib/netrc.h", + "lib/non-ascii.c", + "lib/non-ascii.h", + "lib/nonblock.c", + "lib/nonblock.h", + "lib/nwlib.c", + "lib/nwos.c", + "lib/openldap.c", + "lib/parsedate.c", + "lib/parsedate.h", + "lib/pingpong.c", + "lib/pingpong.h", + "lib/pipeline.c", + "lib/pipeline.h", + "lib/pop3.c", + "lib/pop3.h", + "lib/progress.c", + "lib/progress.h", + "lib/psl.c", + "lib/psl.h", + "lib/rand.c", + "lib/rand.h", + "lib/rtsp.c", + "lib/rtsp.h", + "lib/security.c", + "lib/select.c", + "lib/select.h", + "lib/sendf.c", + "lib/sendf.h", + "lib/setopt.c", + "lib/setopt.h", + "lib/setup-os400.h", + "lib/setup-vms.h", + "lib/sha256.c", + "lib/share.c", + "lib/share.h", + "lib/sigpipe.h", + "lib/slist.c", + "lib/slist.h", + "lib/smb.c", + "lib/smb.h", + "lib/smtp.c", + "lib/smtp.h", + "lib/sockaddr.h", + "lib/socks.c", + "lib/socks.h", + "lib/socks_gssapi.c", + "lib/socks_sspi.c", + "lib/speedcheck.c", + "lib/speedcheck.h", + "lib/splay.c", + "lib/splay.h", + "lib/ssh-libssh.c", + "lib/ssh.c", + "lib/ssh.h", + "lib/strcase.c", + "lib/strcase.h", + "lib/strdup.c", + "lib/strdup.h", + "lib/strerror.c", + "lib/strerror.h", + "lib/strtok.c", + "lib/strtok.h", + "lib/strtoofft.c", + "lib/strtoofft.h", + "lib/system_win32.c", + "lib/system_win32.h", + "lib/telnet.c", + "lib/telnet.h", + "lib/tftp.c", + "lib/tftp.h", + "lib/timeval.c", + "lib/timeval.h", + "lib/transfer.c", + "lib/transfer.h", + "lib/url.c", + "lib/url.h", + "lib/urlapi-int.h", + "lib/urlapi.c", + "lib/urldata.h", + "lib/vauth/cleartext.c", + "lib/vauth/cram.c", + "lib/vauth/digest.c", + "lib/vauth/digest.h", + "lib/vauth/digest_sspi.c", + "lib/vauth/krb5_gssapi.c", + "lib/vauth/krb5_sspi.c", + "lib/vauth/ntlm.c", + "lib/vauth/ntlm.h", + "lib/vauth/ntlm_sspi.c", + "lib/vauth/oauth2.c", + "lib/vauth/spnego_gssapi.c", + "lib/vauth/spnego_sspi.c", + "lib/vauth/vauth.c", + "lib/vauth/vauth.h", + "lib/version.c", + "lib/vtls/cyassl.c", + "lib/vtls/cyassl.h", + "lib/vtls/darwinssl.c", + "lib/vtls/darwinssl.h", + "lib/vtls/gskit.c", + "lib/vtls/gskit.h", + "lib/vtls/gtls.c", + "lib/vtls/gtls.h", + "lib/vtls/mbedtls.c", + "lib/vtls/mbedtls.h", + "lib/vtls/mesalink.c", + "lib/vtls/mesalink.h", + "lib/vtls/nss.c", + "lib/vtls/nssg.h", + "lib/vtls/openssl.c", + "lib/vtls/openssl.h", + "lib/vtls/polarssl.c", + "lib/vtls/polarssl.h", + "lib/vtls/polarssl_threadlock.c", + "lib/vtls/polarssl_threadlock.h", + "lib/vtls/schannel.c", + "lib/vtls/schannel.h", + "lib/vtls/schannel_verify.c", + "lib/vtls/vtls.c", + "lib/vtls/vtls.h", + "lib/warnless.c", + "lib/warnless.h", + "lib/wildcard.c", + "lib/wildcard.h", + "lib/x509asn1.c", + "lib/x509asn1.h", + ], + hdrs = [ + "include/curl/curl.h", + "include/curl/curlver.h", + "include/curl/easy.h", + "include/curl/mprintf.h", + "include/curl/multi.h", + "include/curl/stdcheaders.h", + "include/curl/system.h", + "include/curl/typecheck-gcc.h", + "include/curl/urlapi.h", + ], + copts = [ + "-Iexternal/curl/lib", + "-D_GNU_SOURCE", + "-DHAVE_CONFIG_H", + "-DCURL_DISABLE_FTP", + "-DCURL_DISABLE_NTLM", # turning it off in configure is not enough + "-DHAVE_LIBZ", + "-DHAVE_ZLIB_H", + "-Wno-std::string-plus-int", + "-DCURL_MAX_WRITE_SIZE=65536", + # dealing with conflicting types when building + "-DBUILDING_LIBCURL", + ], + includes = [ + "include", + # lib/curl_setup.h is included by many .c files under lib/ + "lib" + ], + linkopts = [ + "-lrt", + ], + visibility = ["//visibility:public"], + deps = [ + "@zlib_repo//:zlib", + "@boringssl_repo//:ssl", + ], +) + +genrule( + name = "configure", + outs = ["include/curl_config.h"], + cmd = "\n".join([ + "cat <<'EOF' >$@", + "#ifndef EXTERNAL_CURL_INCLUDE_CURL_CONFIG_H_", + "#define EXTERNAL_CURL_INCLUDE_CURL_CONFIG_H_", + "", + "#if !defined(_WIN32) && !defined(__APPLE__)", + "# include ", + "# if defined(OPENSSL_IS_BORINGSSL)", + "# define HAVE_BORINGSSL 1", + "# endif", + "#endif", + "", + "#if defined(_WIN32)", + "# include \"lib/config-win32.h\"", + "# define BUILDING_LIBCURL 1", + "# define CURL_DISABLE_CRYPTO_AUTH 1", + "# define CURL_DISABLE_IMAP 1", + "# define CURL_DISABLE_LDAP 1", + "# define CURL_DISABLE_LDAPS 1", + "# define CURL_DISABLE_POP3 1", + "# define CURL_PULL_WS2TCPIP_H 1", + "# define HTTP_ONLY 1", + "#elif defined(__APPLE__)", + "# define HAVE_FSETXATTR_6 1", + "# define HAVE_SETMODE 1", + "# define HAVE_SYS_FILIO_H 1", + "# define HAVE_SYS_SOCKIO_H 1", + "# define OS \"x86_64-apple-darwin15.5.0\"", + "# define USE_DARWINSSL 1", + "#else", + "# define CURL_CA_BUNDLE \"/etc/ssl/certs/ca-certificates.crt\"", + "# define GETSERVBYPORT_R_ARGS 6", + "# define GETSERVBYPORT_R_BUFSIZE 4096", + "# define HAVE_BORINGSSL 1", + "# define HAVE_CLOCK_GETTIME_MONOTONIC 1", + "# define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1", + "# define HAVE_FSETXATTR_5 1", + "# define HAVE_GETHOSTBYADDR_R 1", + "# define HAVE_GETHOSTBYADDR_R_8 1", + "# define HAVE_GETHOSTBYNAME_R 1", + "# define HAVE_GETHOSTBYNAME_R_6 1", + "# define HAVE_GETSERVBYPORT_R 1", + "# define HAVE_LIBSSL 1", + "# define HAVE_MALLOC_H 1", + "# define HAVE_MSG_NOSIGNAL 1", + "# define HAVE_OPENSSL_CRYPTO_H 1", + "# define HAVE_OPENSSL_ERR_H 1", + "# define HAVE_OPENSSL_PEM_H 1", + "# define HAVE_OPENSSL_PKCS12_H 1", + "# define HAVE_OPENSSL_RSA_H 1", + "# define HAVE_OPENSSL_SSL_H 1", + "# define HAVE_OPENSSL_X509_H 1", + "# define HAVE_RAND_EGD 1", + "# define HAVE_RAND_STATUS 1", + "# define HAVE_SSL_GET_SHUTDOWN 1", + "# define HAVE_STROPTS_H 1", + "# define HAVE_TERMIOS_H 1", + "# define OS \"x86_64-pc-linux-gnu\"", + "# define RANDOM_FILE \"/dev/urandom\"", + "# define USE_OPENSSL 1", + "#endif", + "", + "#if !defined(_WIN32)", + "# define CURL_DISABLE_DICT 1", + "# define CURL_DISABLE_FILE 1", + "# define CURL_DISABLE_GOPHER 1", + "# define CURL_DISABLE_IMAP 1", + "# define CURL_DISABLE_LDAP 1", + "# define CURL_DISABLE_LDAPS 1", + "# define CURL_DISABLE_POP3 1", + "# define CURL_DISABLE_SMTP 1", + "# define CURL_DISABLE_TELNET 1", + "# define CURL_DISABLE_TFTP 1", + "# define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ (\"default\")))", + "# define ENABLE_IPV6 1", + "# define GETHOSTNAME_TYPE_ARG2 size_t", + "# define GETNAMEINFO_QUAL_ARG1 const", + "# define GETNAMEINFO_TYPE_ARG1 struct sockaddr *", + "# define GETNAMEINFO_TYPE_ARG2 socklen_t", + "# define GETNAMEINFO_TYPE_ARG46 socklen_t", + "# define GETNAMEINFO_TYPE_ARG7 int", + "# define HAVE_ALARM 1", + "# define HAVE_ALLOCA_H 1", + "# define HAVE_ARPA_INET_H 1", + "# define HAVE_ARPA_TFTP_H 1", + "# define HAVE_ASSERT_H 1", + "# define HAVE_BASENAME 1", + "# define HAVE_BOOL_T 1", + "# define HAVE_CONNECT 1", + "# define HAVE_DLFCN_H 1", + "# define HAVE_ERRNO_H 1", + "# define HAVE_FCNTL 1", + "# define HAVE_FCNTL_H 1", + "# define HAVE_FCNTL_O_NONBLOCK 1", + "# define HAVE_FDOPEN 1", + "# define HAVE_FORK 1", + "# define HAVE_FREEADDRINFO 1", + "# define HAVE_FREEIFADDRS 1", + "# if !defined(__ANDROID__)", + "# define HAVE_FSETXATTR 1", + "# endif", + "# define HAVE_FTRUNCATE 1", + "# define HAVE_GAI_STRERROR 1", + "# define HAVE_GETADDRINFO 1", + "# define HAVE_GETADDRINFO_THREADSAFE 1", + "# define HAVE_GETEUID 1", + "# define HAVE_GETHOSTBYADDR 1", + "# define HAVE_GETHOSTBYNAME 1", + "# define HAVE_GETHOSTNAME 1", + "# if !defined(__ANDROID__)", + "# define HAVE_GETIFADDRS 1", + "# endif", + "# define HAVE_GETNAMEINFO 1", + "# define HAVE_GETPPID 1", + "# define HAVE_GETPROTOBYNAME 1", + "# define HAVE_GETPWUID 1", + "# if !defined(__ANDROID__)", + "# define HAVE_GETPWUID_R 1", + "# endif", + "# define HAVE_GETRLIMIT 1", + "# define HAVE_GETTIMEOFDAY 1", + "# define HAVE_GMTIME_R 1", + "# if !defined(__ANDROID__)", + "# define HAVE_IFADDRS_H 1", + "# endif", + "# define HAVE_IF_NAMETOINDEX 1", + "# define HAVE_INET_ADDR 1", + "# define HAVE_INET_NTOP 1", + "# define HAVE_INET_PTON 1", + "# define HAVE_INTTYPES_H 1", + "# define HAVE_IOCTL 1", + "# define HAVE_IOCTL_FIONBIO 1", + "# define HAVE_IOCTL_SIOCGIFADDR 1", + "# define HAVE_LIBGEN_H 1", + "# define HAVE_LIBZ 1", + "# define HAVE_LIMITS_H 1", + "# define HAVE_LL 1", + "# define HAVE_LOCALE_H 1", + "# define HAVE_LOCALTIME_R 1", + "# define HAVE_LONGLONG 1", + "# define HAVE_MEMORY_H 1", + "# define HAVE_NETDB_H 1", + "# define HAVE_NETINET_IN_H 1", + "# define HAVE_NETINET_TCP_H 1", + "# define HAVE_NET_IF_H 1", + "# define HAVE_PERROR 1", + "# define HAVE_PIPE 1", + "# define HAVE_POLL 1", + "# define HAVE_POLL_FINE 1", + "# define HAVE_POLL_H 1", + "# define HAVE_POSIX_STRERROR_R 1", + "# define HAVE_PWD_H 1", + "# define HAVE_RECV 1", + "# define HAVE_SELECT 1", + "# define HAVE_SEND 1", + "# define HAVE_SETJMP_H 1", + "# define HAVE_SETLOCALE 1", + "# define HAVE_SETRLIMIT 1", + "# define HAVE_SETSOCKOPT 1", + "# define HAVE_SGTTY_H 1", + "# define HAVE_SIGACTION 1", + "# define HAVE_SIGINTERRUPT 1", + "# define HAVE_SIGNAL 1", + "# define HAVE_SIGNAL_H 1", + "# define HAVE_SIGSETJMP 1", + "# define HAVE_SIG_ATOMIC_T 1", + "# define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1", + "# define HAVE_SOCKET 1", + "# define HAVE_SOCKETPAIR 1", + "# define HAVE_STDBOOL_H 1", + "# define HAVE_STDINT_H 1", + "# define HAVE_STDIO_H 1", + "# define HAVE_STDLIB_H 1", + "# define HAVE_STRCASECMP 1", + "# define HAVE_STRDUP 1", + "# define HAVE_STRERROR_R 1", + "# define HAVE_STRINGS_H 1", + "# define HAVE_STRING_H 1", + "# define HAVE_STRNCASECMP 1", + "# define HAVE_STRSTR 1", + "# define HAVE_STRTOK_R 1", + "# define HAVE_STRTOLL 1", + "# define HAVE_STRUCT_SOCKADDR_STORAGE 1", + "# define HAVE_STRUCT_TIMEVAL 1", + "# define HAVE_SYS_IOCTL_H 1", + "# define HAVE_SYS_PARAM_H 1", + "# define HAVE_SYS_POLL_H 1", + "# define HAVE_SYS_RESOURCE_H 1", + "# define HAVE_SYS_SELECT_H 1", + "# define HAVE_SYS_SOCKET_H 1", + "# define HAVE_SYS_STAT_H 1", + "# define HAVE_SYS_TIME_H 1", + "# define HAVE_SYS_TYPES_H 1", + "# define HAVE_SYS_UIO_H 1", + "# define HAVE_SYS_UN_H 1", + "# define HAVE_SYS_WAIT_H 1", + "# define HAVE_SYS_XATTR_H 1", + "# define HAVE_TIME_H 1", + "# define HAVE_UNAME 1", + "# define HAVE_UNISTD_H 1", + "# define HAVE_UTIME 1", + "# define HAVE_UTIME_H 1", + "# define HAVE_VARIADIC_MACROS_C99 1", + "# define HAVE_VARIADIC_MACROS_GCC 1", + "# define HAVE_WRITABLE_ARGV 1", + "# define HAVE_WRITEV 1", + "# define HAVE_ZLIB_H 1", + "# define LT_OBJDIR \".libs/\"", + "# define PACKAGE \"curl\"", + "# define PACKAGE_BUGREPORT \"a suitable curl mailing list: https://curl.haxx.se/mail/\"", + "# define PACKAGE_NAME \"curl\"", + "# define PACKAGE_STRING \"curl -\"", + "# define PACKAGE_TARNAME \"curl\"", + "# define PACKAGE_URL \"\"", + "# define PACKAGE_VERSION \"-\"", + "# define RECV_TYPE_ARG1 int", + "# define RECV_TYPE_ARG2 void *", + "# define RECV_TYPE_ARG3 size_t", + "# define RECV_TYPE_ARG4 int", + "# define RECV_TYPE_RETV ssize_t", + "# define RETSIGTYPE void", + "# define SELECT_QUAL_ARG5", + "# define SELECT_TYPE_ARG1 int", + "# define SELECT_TYPE_ARG234 fd_set *", + "# define SELECT_TYPE_ARG5 struct timeval *", + "# define SELECT_TYPE_RETV int", + "# define SEND_QUAL_ARG2 const", + "# define SEND_TYPE_ARG1 int", + "# define SEND_TYPE_ARG2 void *", + "# define SEND_TYPE_ARG3 size_t", + "# define SEND_TYPE_ARG4 int", + "# define SEND_TYPE_RETV ssize_t", + "# define SIZEOF_INT 4", + "# define SIZEOF_LONG 8", + "# define SIZEOF_OFF_T 8", + "# define SIZEOF_SHORT 2", + "# define SIZEOF_SIZE_T 8", + "# define SIZEOF_TIME_T 8", + "# define SIZEOF_VOIDP 8", + "# define SIZEOF_CURL_OFF_T 8", + "# define STDC_HEADERS 1", + "# define STRERROR_R_TYPE_ARG3 size_t", + "# define TIME_WITH_SYS_TIME 1", + "# define VERSION \"-\"", + "# ifndef _DARWIN_USE_64_BIT_INODE", + "# define _DARWIN_USE_64_BIT_INODE 1", + "# endif", + "#endif", + "", + "#endif // EXTERNAL_CURL_INCLUDE_CURL_CONFIG_H_", + "EOF", + ]), +) diff --git a/external_build_files/zlib.BUILD b/external_build_files/zlib.BUILD new file mode 100755 index 0000000..64834f5 --- /dev/null +++ b/external_build_files/zlib.BUILD @@ -0,0 +1,48 @@ +################################################################################ +# Copyright 2018 Google LLC. +# +# This software is licensed under the terms defined in the Widevine Master +# License Agreement. For a copy of this agreement, please contact +# widevine-licensing@google.com. +################################################################################ + +# Build file for zlib. + +package(default_visibility = ["//visibility:public"]) + +cc_library( + name = "zlib", + srcs = [ + "adler32.c", + "compress.c", + "crc32.c", + "crc32.h", + "deflate.c", + "deflate.h", + "gzclose.c", + "gzguts.h", + "gzlib.c", + "gzread.c", + "gzwrite.c", + "infback.c", + "inffast.c", + "inffast.h", + "inffixed.h", + "inflate.c", + "inflate.h", + "inftrees.c", + "inftrees.h", + "trees.c", + "trees.h", + "uncompr.c", + "zconf.h", + "zutil.c", + "zutil.h", + ], + hdrs = ["zlib.h"], + copts = [ + "-Wno-shift-negative-value", + "-Wno-implicit-function-declaration", + ], + includes = ["."], +) diff --git a/media_cas_packager_sdk/internal/BUILD b/media_cas_packager_sdk/internal/BUILD index eea33b3..17b702d 100644 --- a/media_cas_packager_sdk/internal/BUILD +++ b/media_cas_packager_sdk/internal/BUILD @@ -26,15 +26,15 @@ cc_library( hdrs = ["ecm.h"], deps = [ "//base", + "@abseil_repo//absl/base:core_headers", + "@abseil_repo//absl/strings", + "//common:status", "//common:aes_cbc_util", "//common:random_util", - "//common:status", "//common:string_util", "//media_cas_packager_sdk/public:wv_cas_types", "//protos/public:media_cas_encryption_proto", "//protos/public:media_cas_proto", - "@abseil_repo//absl/base:core_headers", - "@abseil_repo//absl/strings", ], ) @@ -44,10 +44,10 @@ cc_test( srcs = ["ecm_test.cc"], deps = [ ":ecm", + "//testing:gunit_main", "//common:status", "//media_cas_packager_sdk/public:wv_cas_types", "//protos/public:media_cas_encryption_proto", - "//testing:gunit_main", ], ) @@ -68,10 +68,10 @@ cc_test( srcs = ["ecm_generator_test.cc"], deps = [ ":ecm_generator", - "//common:aes_cbc_util", - "//protos/public:media_cas_encryption_proto", "//testing:gunit_main", "@abseil_repo//absl/memory", + "//common:aes_cbc_util", + "//protos/public:media_cas_encryption_proto", ], ) @@ -88,12 +88,12 @@ cc_library( ":fixed_key_fetcher", ":util", "//base", - "//common:status", - "//example:constants", - "//media_cas_packager_sdk/public:wv_cas_types", "@abseil_repo//absl/base:core_headers", "@abseil_repo//absl/memory", "@abseil_repo//absl/strings", + "//common:status", + "//example:constants", + "//media_cas_packager_sdk/public:wv_cas_types", ], ) @@ -142,9 +142,9 @@ cc_library( ":ecmg", ":util", "//base", - "//common:status", "@abseil_repo//absl/base:core_headers", "@abseil_repo//absl/strings", + "//common:status", ], ) @@ -154,8 +154,8 @@ cc_test( srcs = ["simulcrypt_test.cc"], deps = [ ":simulcrypt", - "//example:test_simulcrypt_messages", "//testing:gunit_main", + "//example:test_simulcrypt_messages", ], ) @@ -171,10 +171,10 @@ cc_library( deps = [ ":mpeg2ts", "//base", - "//common:status", - "//common:string_util", "@abseil_repo//absl/base:core_headers", "@abseil_repo//absl/strings", + "//common:status", + "//common:string_util", ], ) @@ -201,8 +201,8 @@ cc_library( ":mpeg2ts", ":ts_packet", "//base", - "//common:status", "@abseil_repo//absl/base:core_headers", + "//common:status", ], ) diff --git a/media_cas_packager_sdk/public/BUILD b/media_cas_packager_sdk/public/BUILD index 2c2d702..089af6f 100644 --- a/media_cas_packager_sdk/public/BUILD +++ b/media_cas_packager_sdk/public/BUILD @@ -39,13 +39,13 @@ cc_library( hdrs = glob(["*.h"]), deps = [ "//base", + "@abseil_repo//absl/base:core_headers", "//common:status", "//media_cas_packager_sdk/internal:ecm", "//media_cas_packager_sdk/internal:ecm_generator", "//media_cas_packager_sdk/internal:key_fetcher", "//protos/public:media_cas_encryption_proto", "//protos/public:media_cas_proto", - "@abseil_repo//absl/base:core_headers", ], ) @@ -66,11 +66,11 @@ cc_library( deps = [ ":wv_cas_types", "//base", + "@abseil_repo//absl/base:core_headers", + "@abseil_repo//absl/strings", "//common:status", "//common:string_util", "//protos/public:media_cas_proto", - "@abseil_repo//absl/base:core_headers", - "@abseil_repo//absl/strings", ], ) @@ -81,8 +81,8 @@ cc_test( deps = [ ":wv_cas_ca_descriptor", ":wv_cas_types", - "//protos/public:media_cas_proto", "//testing:gunit_main", + "//protos/public:media_cas_proto", ], ) @@ -94,17 +94,17 @@ cc_library( deps = [ ":wv_cas_types", "//base", - "//common:crypto_util", + "@abseil_repo//absl/base:core_headers", # buildcleaner: keep + "@abseil_repo//absl/memory", # buildcleaner: keep + "@abseil_repo//absl/strings", # buildcleaner: keep "//common:status", + "//common:crypto_util", "//example:constants", "//media_cas_packager_sdk/internal:ecm", "//media_cas_packager_sdk/internal:ecm_generator", "//media_cas_packager_sdk/internal:fixed_key_fetcher", "//media_cas_packager_sdk/internal:mpeg2ts", "//media_cas_packager_sdk/internal:util", - "@abseil_repo//absl/base:core_headers", # buildcleaner: keep - "@abseil_repo//absl/memory", # buildcleaner: keep - "@abseil_repo//absl/strings", # buildcleaner: keep ], ) @@ -115,9 +115,9 @@ cc_test( deps = [ ":wv_cas_ecm", ":wv_cas_types", - "//media_cas_packager_sdk/internal:mpeg2ts", "//testing:gunit_main", "@abseil_repo//absl/strings", + "//media_cas_packager_sdk/internal:mpeg2ts", ], ) @@ -131,13 +131,13 @@ cc_library( ], deps = [ "//base", - "//common:signature_util", - "//common:status", - "//media_cas_packager_sdk/internal:key_fetcher", - "//protos/public:media_cas_encryption_proto", "@abseil_repo//absl/base:core_headers", "@abseil_repo//absl/strings", "@curl_repo//:curl", + "//common:status", + "//common:signature_util", + "//media_cas_packager_sdk/internal:key_fetcher", + "//protos/public:media_cas_encryption_proto", ], ) @@ -150,11 +150,11 @@ cc_test( deps = [ ":wv_cas_key_fetcher", "//base", - "//common:status", "//external:protobuf", - "//protos/public:media_cas_encryption_proto", "//testing:gunit_main", "@abseil_repo//absl/strings", + "//common:status", + "//protos/public:media_cas_encryption_proto", ], ) diff --git a/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc b/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc index 17e3cef..db239f7 100644 --- a/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc +++ b/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc @@ -14,7 +14,7 @@ #include "gflags/gflags.h" #include "glog/logging.h" -#include "net/proto2/util/public/json_util.h" +#include "google/protobuf/util/json_util.h" #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" diff --git a/media_cas_packager_sdk/public/wv_cas_key_fetcher.h b/media_cas_packager_sdk/public/wv_cas_key_fetcher.h index 60ee3a3..03eddec 100644 --- a/media_cas_packager_sdk/public/wv_cas_key_fetcher.h +++ b/media_cas_packager_sdk/public/wv_cas_key_fetcher.h @@ -11,7 +11,7 @@ #include -#include "base/commandlineflags_declare.h" +#include "gflags/gflags.h" #include "common/status.h" #include "media_cas_packager_sdk/internal/key_fetcher.h" diff --git a/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc b/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc index b032845..651d569 100644 --- a/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc +++ b/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc @@ -8,7 +8,7 @@ #include "media_cas_packager_sdk/public/wv_cas_key_fetcher.h" -#include "base/commandlineflags_declare.h" +#include "gflags/gflags.h" #include "glog/logging.h" #include "google/protobuf/text_format.h" #include "testing/gmock.h"