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

Unified Diff: media/BUILD.gn

Issue 419913003: Make content_shell link in the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android spelling Created 6 years, 5 months 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 | « content/shell/BUILD.gn ('k') | third_party/mesa/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index f2acd92058a1f9ded7d903cc87cef344cc060509..4f2360c84997d0a6335c132d2db24f0eb2f25987 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -15,9 +15,6 @@ config("media_config") {
if (cpu_arch == "arm" && arm_use_neon) {
defines += [ "USE_NEON" ]
}
- if (!media_use_libvpx) {
- defines += [ "MEDIA_DISABLE_LIBVPX" ]
- }
if (use_pulseaudio) {
defines += [ "USE_PULSEAUDIO" ]
if (linux_link_pulseaudio) {
@@ -33,6 +30,9 @@ config("media_config") {
}
config("media_dependent_config") {
+ if (!media_use_libvpx) {
+ defines = [ "MEDIA_DISABLE_LIBVPX" ]
+ }
if (is_win) {
ldflags = [
"/DELAYLOAD:mf.dll",
« no previous file with comments | « content/shell/BUILD.gn ('k') | third_party/mesa/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698