Chromium Code Reviews| 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 widevine_arch = cpu_arch | 5 widevine_arch = current_cpu |
|
ddorwin
2015/02/20 02:47:08
The description says "current_cpu_arch", but multi
ddorwin
2015/02/20 02:53:35
What is the difference between current_cpu and tar
Dirk Pranke
2015/02/20 03:00:26
generally you want current_cpu (the cpu of the cur
| |
| 6 if (widevine_arch == "x86") { | 6 if (widevine_arch == "x86") { |
| 7 widevine_arch = "ia32" | 7 widevine_arch = "ia32" |
| 8 } | 8 } |
| 9 | 9 |
| 10 if (is_android) { | 10 if (is_android) { |
| 11 # Always available on Android regardless of branding. | 11 # Always available on Android regardless of branding. |
| 12 widevine_cdm_version_h_file = "android/widevine_cdm_version.h" | 12 widevine_cdm_version_h_file = "android/widevine_cdm_version.h" |
| 13 widevine_cdm_binary_files = [] | 13 widevine_cdm_binary_files = [] |
| 14 } else if (is_chrome_branded) { | 14 } else if (is_chrome_branded) { |
| 15 if (is_chromeos) { | 15 if (is_chromeos) { |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 # on the license server. | 94 # on the license server. |
| 95 source_set("widevine_test_license_server") { | 95 source_set("widevine_test_license_server") { |
| 96 if (is_chrome_branded && is_linux) { | 96 if (is_chrome_branded && is_linux) { |
| 97 deps = [ | 97 deps = [ |
| 98 # TODO(GYP) | 98 # TODO(GYP) |
| 99 # This target should be removed and targets should have datadeps on this t arget: | 99 # This target should be removed and targets should have datadeps on this t arget: |
| 100 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen se_server" | 100 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen se_server" |
| 101 ] | 101 ] |
| 102 } | 102 } |
| 103 } | 103 } |
| OLD | NEW |