Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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("//build/config/sanitizers/sanitizers.gni") | 7 import("//build/config/sanitizers/sanitizers.gni") |
| 8 import("//build/util/process_version.gni") | 8 import("//build/util/process_version.gni") |
| 9 import("//build/util/version.gni") | 9 import("//build/util/version.gni") |
| 10 import("//chrome/process_version_rc_template.gni") # For branding_file_path. | 10 import("//chrome/process_version_rc_template.gni") # For branding_file_path. |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 184 if (enable_nacl) { | 184 if (enable_nacl) { |
| 185 public_deps += [ | 185 public_deps += [ |
| 186 "//components/nacl/loader:nacl_helper", | 186 "//components/nacl/loader:nacl_helper", |
| 187 | 187 |
| 188 # These are data_deps of nacl_helper, but that is not enough, | 188 # These are data_deps of nacl_helper, but that is not enough, |
| 189 # as explained above. | 189 # as explained above. |
| 190 "//native_client/src/trusted/service_runtime/linux:bootstrap", | 190 "//native_client/src/trusted/service_runtime/linux:bootstrap", |
| 191 "//ppapi/native_client:irt", | 191 "//ppapi/native_client:irt", |
| 192 ] | 192 ] |
| 193 } | 193 } |
| 194 if (current_cpu == "x86" || current_cpu == "x64") { | 194 if (current_cpu == "x86" || current_cpu == "x64") { |
|
ddorwin
2016/10/07 22:37:52
Maybe we should remove this since it does build an
xhwang
2016/10/07 22:51:27
+1
Sam Clegg
2016/10/07 22:51:48
I agree, but I'd like to keep this CL minimal to a
| |
| 195 public_deps += [ | 195 public_deps += [ |
| 196 "//third_party/widevine/cdm:widevinecdm", | 196 "//third_party/widevine/cdm:widevinecdm", |
| 197 "//third_party/widevine/cdm:widevinecdmadapter", | 197 "//third_party/widevine/cdm:widevinecdmadapter", |
| 198 ] | 198 ] |
| 199 } | 199 } |
| 200 if (!is_chromeos) { | 200 if (!is_chromeos) { |
| 201 public_deps += [ ":rpm_packaging_files" ] | 201 public_deps += [ ":rpm_packaging_files" ] |
| 202 } | 202 } |
| 203 } | 203 } |
| 204 | 204 |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 231 ] | 231 ] |
| 232 | 232 |
| 233 if (current_cpu == "x86") { | 233 if (current_cpu == "x86") { |
| 234 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_32.nexe" ] | 234 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_32.nexe" ] |
| 235 } else if (current_cpu == "x64") { | 235 } else if (current_cpu == "x64") { |
| 236 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_64.nexe" ] | 236 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_64.nexe" ] |
| 237 } else if (current_cpu == "arm") { | 237 } else if (current_cpu == "arm") { |
| 238 packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ] | 238 packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ] |
| 239 } | 239 } |
| 240 | 240 |
| 241 if (is_chrome_branded) { | 241 if (is_chrome_branded && (current_cpu == "x86" || current_cpu == "x64")) { |
|
ddorwin
2016/10/07 22:37:52
You might explain this in a comment. For example,
Sam Clegg
2016/10/07 22:51:48
Done.
| |
| 242 packaging_files_binaries += [ | 242 packaging_files_binaries += [ |
| 243 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so", | 243 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so", |
|
ddorwin
2016/10/07 22:37:52
I wonder if this should be the output of the build
xhwang
2016/10/07 22:51:27
I was following other examples in this file and I
Sam Clegg
2016/10/07 22:51:48
Sounds like a good idea, but something for another
| |
| 244 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", | 244 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", |
| 245 ] | 245 ] |
| 246 } | 246 } |
| 247 | 247 |
| 248 if (is_asan) { | 248 if (is_asan) { |
| 249 packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ] | 249 packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ] |
| 250 } | 250 } |
| 251 | 251 |
| 252 deb_target_name = "${target_name}_deb" | 252 deb_target_name = "${target_name}_deb" |
| 253 action(deb_target_name) { | 253 action(deb_target_name) { |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 353 # Other packages that we support that aren't included in the default "linux" | 353 # Other packages that we support that aren't included in the default "linux" |
| 354 # target. | 354 # target. |
| 355 linux_package("trunk") { | 355 linux_package("trunk") { |
| 356 channel = "trunk" | 356 channel = "trunk" |
| 357 } | 357 } |
| 358 if (is_asan) { | 358 if (is_asan) { |
| 359 linux_package("asan") { | 359 linux_package("asan") { |
| 360 channel = "asan" | 360 channel = "asan" |
| 361 } | 361 } |
| 362 } | 362 } |
| OLD | NEW |