Manually copy changes from output generated by 'moe test'

This commit is contained in:
Fang Yu
2018-12-07 17:03:39 -08:00
parent ce7124219a
commit 7487ce5aa8
7 changed files with 664 additions and 32 deletions

View File

@@ -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",
],
)

View File

@@ -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",
],
)

View File

@@ -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"

View File

@@ -11,7 +11,7 @@
#include <string>
#include "base/commandlineflags_declare.h"
#include "gflags/gflags.h"
#include "common/status.h"
#include "media_cas_packager_sdk/internal/key_fetcher.h"

View File

@@ -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"