diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 00:40:03 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 00:40:03 +0000 |
| commit | 6b5d2f943a91bf8a33642692cdf34d832ad3adea (patch) | |
| tree | 0999856e609d547f9539268b9b211b1e844f883e /media/media_options.gni | |
| parent | d6cb41986a729ed1a42f4460145d42c199ec608b (diff) | |
| download | chromium_src-6b5d2f943a91bf8a33642692cdf34d832ad3adea.zip chromium_src-6b5d2f943a91bf8a33642692cdf34d832ad3adea.tar.gz chromium_src-6b5d2f943a91bf8a33642692cdf34d832ad3adea.tar.bz2 | |
GN: Make chrome/{browser,common,renderer} compile on mac
This adds GN rules for google_toolbox_for_mac and generate_localize as
well as fixing up various source issues that show up on the mac build.
With this chrome/{browser,common,renderer} compile on mac (but probably
don't fully link).
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/407093015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media_options.gni')
| -rw-r--r-- | media/media_options.gni | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/media_options.gni b/media/media_options.gni index 6bd1f5a..23decab 100644 --- a/media/media_options.gni +++ b/media/media_options.gni @@ -27,7 +27,7 @@ if (is_android) { # Original conditional: (OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1 use_alsa = false use_pulseaudio = false -if (is_posix && !is_android) { +if (is_posix && !is_android && !is_mac) { use_alsa = true if (!use_cras) { use_pulseaudio = true |