Allow widevinecdmadapter to be built in Chromium

third_party/widevine/cdm/stub/widevine_cdm_version.h

Index: third_party/widevine/cdm/stub/widevine_cdm_version.h
diff --git a/third_party/widevine/cdm/android/widevine_cdm_version.h b/third_party/widevine/cdm/stub/widevine_cdm_version.h
similarity index 64%
copy from third_party/widevine/cdm/android/widevine_cdm_version.h
copy to third_party/widevine/cdm/stub/widevine_cdm_version.h
index 6897ed2a3e40498fe48fa704049d87d04330374c..659683ba2aca31b24f9e9197ca18330f0249ee19 100644
--- a/third_party/widevine/cdm/android/widevine_cdm_version.h
+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
@@ -1,13 +1,15 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2015 The Chromium Authors. All rights reserved.

[ddorwin, 2015/04/01 23:27:32]

Widevine file should be in t_p/wv.

[jrummell, 2015/04/02 23:47:55]

The Android specific one is in t_p/wv/cdm/android, and the generic one is in
t_p/wv/cdm. I think it would be confusing to have it in the top directory.

[ddorwin, 2015/04/03 02:06:56]

WV-specific code doesn't belong here.

You can put it in a stub/ directory, name it stub_.../ or even just use the
Android one. That might be the simplest. You can reference 349182, which will
eliminate the need for such a file.

[ddorwin, 2015/04/03 18:30:56]

As discussed, this is fine. My original comment was incorrect, which led to a
confusing conversation. Sorry about that.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// This is a stand-in for a generated file that is available when the
+// Widevine CDM is available.
+
 #ifndef WIDEVINE_CDM_VERSION_H_
 #define WIDEVINE_CDM_VERSION_H_
 
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
-// Indicates that the Widevine CDM is available.
 #define WIDEVINE_CDM_AVAILABLE

[xhwang, 2015/04/02 18:51:52]

What's the long term plan on this? Should we just define WIDEVINE_CDM_AVAILABLE
based on 'enable_widevine'?

[ddorwin, 2015/04/02 23:20:59]

Yes, this file will go away. Until we have the long-term GYP/GN fix, though, we
rely on the magic of including this file in various parts of Chromium.

[jrummell, 2015/04/02 23:47:55]

enable_widevine is just a gyp variable currently, and doesn't make it into the
code. sandersd@ CL was an attempt to clean it up, but ran into problems changing
common.gypi (where the -D would need to be specified).

 
 #endif  // WIDEVINE_CDM_VERSION_H_