Commit 7b878233 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Remove unnecessary include of widevine_cdm_version.h on Android

Now Widevine support is controlled by "enable_widevine" gn arg and this
header is not used on Android at all.

These were missed from previous CLs.

Bug: 349182
Test: No functionality change.
Change-Id: I651ec23a394d566c78a6c43e6cc9e06ff18d17fc
Reviewed-on: https://chromium-review.googlesource.com/1256005
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: default avatarJohn Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595662}
parent a6ebc8e4
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#include "third_party/widevine/cdm/widevine_cdm_common.h" #include "third_party/widevine/cdm/widevine_cdm_common.h"
#include "url/gurl.h" #include "url/gurl.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
using base::android::JavaParamRef; using base::android::JavaParamRef;
using base::android::ScopedJavaGlobalRef; using base::android::ScopedJavaGlobalRef;
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include "third_party/widevine/cdm/widevine_cdm_common.h" #include "third_party/widevine/cdm/widevine_cdm_common.h"
#include "url/origin.h" #include "url/origin.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
namespace { namespace {
// Unprovision MediaDrm in IO thread. // Unprovision MediaDrm in IO thread.
void ClearMediaDrmLicensesBlocking( void ClearMediaDrmLicensesBlocking(
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#include "media/media_buildflags.h" #include "media/media_buildflags.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h" #include "third_party/widevine/cdm/widevine_cdm_common.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
using media::EmeConfigRule; using media::EmeConfigRule;
using media::EmeFeatureSupport; using media::EmeFeatureSupport;
using media::EmeInitDataType; using media::EmeInitDataType;
......
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
#include "media/base/provision_fetcher.h" #include "media/base/provision_fetcher.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h" #include "third_party/widevine/cdm/widevine_cdm_common.h"
// In SHARED_INTERMEDIATE_DIR
#include "widevine_cdm_version.h" // NOLINT(build/include)
using base::android::AttachCurrentThread; using base::android::AttachCurrentThread;
using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF8ToJavaString;
using base::android::ConvertJavaStringToUTF8; using base::android::ConvertJavaStringToUTF8;
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h" #include "third_party/widevine/cdm/widevine_cdm_common.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
namespace media { namespace media {
#define EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(a) \ #define EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(a) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment