| 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/buildflag_header.gni") |
| 5 import("//build/config/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 7 import("//chrome/process_version_rc_template.gni") | 8 import("//chrome/process_version_rc_template.gni") |
| 8 import("//media/cdm/ppapi/cdm_paths.gni") | 9 import("//media/cdm/ppapi/cdm_paths.gni") |
| 9 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni") | 10 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni") |
| 10 import("//third_party/widevine/cdm/widevine.gni") | 11 import("//third_party/widevine/cdm/widevine.gni") |
| 11 | 12 |
| 12 widevine_arch = current_cpu | 13 widevine_arch = current_cpu |
| 13 if (widevine_arch == "x86") { | 14 if (widevine_arch == "x86") { |
| 14 widevine_arch = "ia32" | 15 widevine_arch = "ia32" |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 # on the license server. | 172 # on the license server. |
| 172 source_set("widevine_test_license_server") { | 173 source_set("widevine_test_license_server") { |
| 173 if (is_chrome_branded && is_linux) { | 174 if (is_chrome_branded && is_linux) { |
| 174 deps = [ | 175 deps = [ |
| 175 # TODO(jrummell) | 176 # TODO(jrummell) |
| 176 # This target should be removed and targets should have data_deps on this
target: | 177 # This target should be removed and targets should have data_deps on this
target: |
| 177 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen
se_server" | 178 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen
se_server" |
| 178 ] | 179 ] |
| 179 } | 180 } |
| 180 } | 181 } |
| 182 |
| 183 buildflag_header("cdm_features") { |
| 184 header = "cdm_features.h" |
| 185 flags = [ |
| 186 "ENABLE_PEPPER_CDMS=$enable_pepper_cdms", |
| 187 ] |
| 188 } |
| OLD | NEW |