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 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/version.gni") # TODO layering violation | 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") |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 "widevinecdmadapter.ver", | 136 "widevinecdmadapter.ver", |
| 137 ] | 137 ] |
| 138 output = "$target_gen_dir/widevinecdmadapter_version.rc" | 138 output = "$target_gen_dir/widevinecdmadapter_version.rc" |
| 139 } | 139 } |
| 140 | 140 |
| 141 ppapi_cdm_adapter("widevinecdmadapter") { | 141 ppapi_cdm_adapter("widevinecdmadapter") { |
| 142 defines = [] | 142 defines = [] |
| 143 output_dir = "$root_out_dir/$widevine_cdm_path" | 143 output_dir = "$root_out_dir/$widevine_cdm_path" |
| 144 deps = [ | 144 deps = [ |
| 145 ":version_h", | 145 ":version_h", |
| 146 ":widevinecdm", | |
| 147 ":widevinecdmadapter_resources", | |
| 148 ] | |
| 149 data_deps = [ | |
| 146 ":widevine_cdm_manifest", | 150 ":widevine_cdm_manifest", |
| 147 ":widevinecdm", | 151 ":widevinecdm", |
|
ddorwin
2016/06/01 20:16:43
deps doesn't imply data_deps?
xhwang
2016/06/01 20:24:12
Apparently not based on "gn help runtime_deps" unl
Dirk Pranke
2016/06/01 21:33:16
Correct, `deps` does not imply `data_deps`. You mi
| |
| 148 ":widevinecdmadapter_resources", | |
| 149 ] | 152 ] |
| 150 | 153 |
| 151 if (is_linux) { | 154 if (is_linux) { |
| 152 ldflags = | 155 ldflags = |
| 153 [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", | 156 [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", |
| 154 root_build_dir) ] | 157 root_build_dir) ] |
| 155 } else if (is_win) { | 158 } else if (is_win) { |
| 156 ldflags = | 159 ldflags = |
| 157 [ rebase_path("$root_out_dir/$widevine_cdm_path/widevinecdm.dll.lib", | 160 [ rebase_path("$root_out_dir/$widevine_cdm_path/widevinecdm.dll.lib", |
| 158 root_build_dir) ] | 161 root_build_dir) ] |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 172 # on the license server. | 175 # on the license server. |
| 173 source_set("widevine_test_license_server") { | 176 source_set("widevine_test_license_server") { |
| 174 if (is_chrome_branded && is_linux) { | 177 if (is_chrome_branded && is_linux) { |
| 175 deps = [ | 178 deps = [ |
| 176 # TODO(jrummell) | 179 # TODO(jrummell) |
| 177 # This target should be removed and targets should have data_deps on this target: | 180 # This target should be removed and targets should have data_deps on this target: |
| 178 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen se_server" | 181 #"//third_party/widevine/test/license_server/license_server.gyp:test_licen se_server" |
| 179 ] | 182 ] |
| 180 } | 183 } |
| 181 } | 184 } |
| OLD | NEW |