| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//chrome/process_version_rc_template.gni") | 7 import("//chrome/version.gni") # TODO layering violation |
| 8 import("//media/cdm/ppapi/cdm_paths.gni") | 8 import("//media/cdm/ppapi/cdm_paths.gni") |
| 9 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni") | 9 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni") |
| 10 import("//third_party/widevine/cdm/widevine.gni") | 10 import("//third_party/widevine/cdm/widevine.gni") |
| 11 | 11 |
| 12 widevine_arch = current_cpu | 12 widevine_arch = current_cpu |
| 13 if (widevine_arch == "x86") { | 13 if (widevine_arch == "x86") { |
| 14 widevine_arch = "ia32" | 14 widevine_arch = "ia32" |
| 15 } | 15 } |
| 16 | 16 |
| 17 widevine_cdm_binary_files = [] | 17 widevine_cdm_binary_files = [] |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 ] | 122 ] |
| 123 } | 123 } |
| 124 } else { | 124 } else { |
| 125 group("widevine_cdm_manifest") { | 125 group("widevine_cdm_manifest") { |
| 126 # NOP | 126 # NOP |
| 127 } | 127 } |
| 128 } | 128 } |
| 129 | 129 |
| 130 if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) { | 130 if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) { |
| 131 # Produce and compile the .rc file. | 131 # Produce and compile the .rc file. |
| 132 process_version_rc_template("widevinecdmadapter_resources") { | 132 process_version("widevinecdmadapter_resources") { |
| 133 visibility = [ ":*" ] | 133 visibility = [ ":*" ] |
| 134 template_file = chrome_version_rc_template |
| 134 sources = [ | 135 sources = [ |
| 135 "BRANDING", | 136 "BRANDING", |
| 136 "widevinecdmadapter.ver", | 137 "widevinecdmadapter.ver", |
| 137 ] | 138 ] |
| 138 output = "$target_gen_dir/widevinecdmadapter_version.rc" | 139 output = "$target_gen_dir/widevinecdmadapter_version.rc" |
| 139 } | 140 } |
| 140 | 141 |
| 141 ppapi_cdm_adapter("widevinecdmadapter") { | 142 ppapi_cdm_adapter("widevinecdmadapter") { |
| 142 defines = [] | 143 defines = [] |
| 143 output_dir = "$root_out_dir/$widevine_cdm_path" | 144 output_dir = "$root_out_dir/$widevine_cdm_path" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 # on the license server. | 176 # on the license server. |
| 176 source_set("widevine_test_license_server") { | 177 source_set("widevine_test_license_server") { |
| 177 if (is_chrome_branded && is_linux) { | 178 if (is_chrome_branded && is_linux) { |
| 178 deps = [ | 179 deps = [ |
| 179 # TODO(jrummell) | 180 # TODO(jrummell) |
| 180 # This target should be removed and targets should have data_deps on this
target: | 181 # This target should be removed and targets should have data_deps on this
target: |
| 181 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen
se_server" | 182 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen
se_server" |
| 182 ] | 183 ] |
| 183 } | 184 } |
| 184 } | 185 } |
| OLD | NEW |