| Index: media/cdm/ppapi/ppapi_cdm_adapter.gni
|
| diff --git a/media/cdm/ppapi/cdm_adapter.gni b/media/cdm/ppapi/ppapi_cdm_adapter.gni
|
| similarity index 86%
|
| rename from media/cdm/ppapi/cdm_adapter.gni
|
| rename to media/cdm/ppapi/ppapi_cdm_adapter.gni
|
| index 3ffacfdf800c83e8295473b082552117900ea85b..cf9327cc02acade323e4e5205860c9abe1394813 100644
|
| --- a/media/cdm/ppapi/cdm_adapter.gni
|
| +++ b/media/cdm/ppapi/ppapi_cdm_adapter.gni
|
| @@ -6,7 +6,7 @@
|
| # normal target and everything should work correctly. If GYP, you would instead
|
| # depend on media/media_cdm_adapter.gyp:cdmadapter which would in turn modify
|
| # your target with direct_dependent_settings.
|
| -template("cdm_adapter") {
|
| +template("ppapi_cdm_adapter") {
|
| # TODO(GYP) On Mac/Linux this should be a loadable_module.
|
| shared_library(target_name) {
|
| # Don't filter sources list again.
|
| @@ -17,19 +17,20 @@ template("cdm_adapter") {
|
| libs = []
|
| forward_variables_from(invoker, "*")
|
|
|
| + defines += [ "USE_PPAPI_CDM_ADAPTER" ]
|
| sources += [
|
| "//media/cdm/api/content_decryption_module.h",
|
| - "//media/cdm/ppapi/cdm_adapter.cc",
|
| - "//media/cdm/ppapi/cdm_adapter.h",
|
| + "//media/cdm/cdm_wrapper.h",
|
| "//media/cdm/ppapi/cdm_file_io_impl.cc",
|
| "//media/cdm/ppapi/cdm_file_io_impl.h",
|
| "//media/cdm/ppapi/cdm_helpers.cc",
|
| "//media/cdm/ppapi/cdm_helpers.h",
|
| "//media/cdm/ppapi/cdm_logging.cc",
|
| "//media/cdm/ppapi/cdm_logging.h",
|
| - "//media/cdm/ppapi/cdm_wrapper.h",
|
| "//media/cdm/ppapi/linked_ptr.h",
|
| - "//media/cdm/ppapi/supported_cdm_versions.h",
|
| + "//media/cdm/ppapi/ppapi_cdm_adapter.cc",
|
| + "//media/cdm/ppapi/ppapi_cdm_adapter.h",
|
| + "//media/cdm/supported_cdm_versions.h",
|
| ]
|
| if (is_mac) {
|
| ldflags += [
|
|
|