From 6a1fcfa108562121e3a74da99e9d083fc41f719c Mon Sep 17 00:00:00 2001 From: Fang Yu Date: Fri, 18 Jan 2019 13:31:03 -0800 Subject: [PATCH] 1) Removes dependency of common/status.h from wv_cas_types. 2) Do not use glogs in example binary code. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=229984175 --- example/wv_cas_types_example.cc | 5 +++-- media_cas_packager_sdk/public/BUILD | 1 - media_cas_packager_sdk/public/wv_cas_types.cc | 1 - media_cas_packager_sdk/public/wv_cas_types.h | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/example/wv_cas_types_example.cc b/example/wv_cas_types_example.cc index c8fb4c1..c0bddda 100644 --- a/example/wv_cas_types_example.cc +++ b/example/wv_cas_types_example.cc @@ -8,9 +8,9 @@ // Example of how to use types/functions in wv_cas_types. +#include #include -#include "glog/logging.h" #include "media_cas_packager_sdk/public/wv_cas_types.h" void CallCreateWvCasEncryptionRequestJson() { @@ -21,7 +21,8 @@ void CallCreateWvCasEncryptionRequestJson() { request.key_rotation = true; std::string request_json; widevine::cas::CreateWvCasEncryptionRequestJson(request, &request_json); - LOG(INFO) << "CreateWvCasEncryptionRequestJson returns " << request_json; + std::cout << "CreateWvCasEncryptionRequestJson returns " << request_json + << std::endl; } int main(int argc, char **argv) { diff --git a/media_cas_packager_sdk/public/BUILD b/media_cas_packager_sdk/public/BUILD index 4e9635b..6a08d10 100644 --- a/media_cas_packager_sdk/public/BUILD +++ b/media_cas_packager_sdk/public/BUILD @@ -161,7 +161,6 @@ cc_library( deps = [ "//base", "//protos/public:media_cas_encryption_proto", - "//common:status", ], ) diff --git a/media_cas_packager_sdk/public/wv_cas_types.cc b/media_cas_packager_sdk/public/wv_cas_types.cc index 02d2da8..cd74c90 100644 --- a/media_cas_packager_sdk/public/wv_cas_types.cc +++ b/media_cas_packager_sdk/public/wv_cas_types.cc @@ -11,7 +11,6 @@ #include "glog/logging.h" #include "base/macros.h" #include "google/protobuf/util/json_util.h" -#include "common/status.h" #include "protos/public/media_cas_encryption.pb.h" using google::protobuf::util::JsonPrintOptions; diff --git a/media_cas_packager_sdk/public/wv_cas_types.h b/media_cas_packager_sdk/public/wv_cas_types.h index c269a62..883fd5a 100644 --- a/media_cas_packager_sdk/public/wv_cas_types.h +++ b/media_cas_packager_sdk/public/wv_cas_types.h @@ -12,8 +12,6 @@ #include #include -#include "common/status.h" - namespace widevine { namespace cas {