Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: BUILD.gn

Issue 1446453004: Adding third_party/openh264 build files for encoding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use_openh264 = conditional on chrome branding again Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « .gn ('k') | build/all.gyp » ('j') | third_party/openh264/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index f58231fc4d16d6b9cdbed524e920c349566a2ae1..fedf8fdd38bc3f06d82890a40242572eecaac9dc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build_overrides/v8.gni")
import("//media/media_options.gni")
+import("//third_party/openh264/openh264_args.gni")
if (is_android) {
import("//build/config/android/config.gni")
@@ -92,6 +93,7 @@ group("both_gn_and_gyp") {
"//skia:skia_unittests",
"//sql:sql_unittests",
"//sync:sync_unit_tests",
+ "//third_party/openh264/testing:openh264_unittests",
Dirk Pranke 2015/11/21 00:48:51 Are you sure you want to add this unconditionally,
hbos_chromium 2015/11/23 09:06:13 If we can make trybots conditionally run the binar
"//ui/base:ui_base_unittests",
"//ui/gfx:gfx_unittests",
"//url:url_unittests",
@@ -586,6 +588,15 @@ group("both_gn_and_gyp") {
if (is_chromecast) {
deps += [ "//chromecast:cast_shell" ]
}
+
+ if (use_openh264) {
+ deps += [
+ "//third_party/openh264:openh264_common",
+ "//third_party/openh264:openh264_processing",
+ "//third_party/openh264:openh264_encoder",
+ "//third_party/openh264:openh264_decoder",
+ ]
+ }
}
group("gn_only") {
« no previous file with comments | « .gn ('k') | build/all.gyp » ('j') | third_party/openh264/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698