| 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/features.gni") | 6 import("//build/config/features.gni") |
| 6 import("//chrome/version.gni") # TODO layering violation | 7 import("//chrome/version.gni") # TODO layering violation |
| 7 import("//media/cdm/ppapi/cdm_adapter.gni") | 8 import("//media/cdm/ppapi/cdm_adapter.gni") |
| 8 import("//third_party/widevine/cdm/widevine.gni") | 9 import("//third_party/widevine/cdm/widevine.gni") |
| 9 | 10 |
| 10 widevine_arch = current_cpu | 11 widevine_arch = current_cpu |
| 11 if (widevine_arch == "x86") { | 12 if (widevine_arch == "x86") { |
| 12 widevine_arch = "ia32" | 13 widevine_arch = "ia32" |
| 13 } | 14 } |
| 14 | 15 |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 # on the license server. | 155 # on the license server. |
| 155 source_set("widevine_test_license_server") { | 156 source_set("widevine_test_license_server") { |
| 156 if (is_chrome_branded && is_linux) { | 157 if (is_chrome_branded && is_linux) { |
| 157 deps = [ | 158 deps = [ |
| 158 # TODO(jrummell) | 159 # TODO(jrummell) |
| 159 # This target should be removed and targets should have datadeps on this t
arget: | 160 # This target should be removed and targets should have datadeps on this t
arget: |
| 160 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen
se_server" | 161 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen
se_server" |
| 161 ] | 162 ] |
| 162 } | 163 } |
| 163 } | 164 } |
| OLD | NEW |