diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 21:29:49 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 21:29:49 +0000 |
| commit | 3ad0946b31fa66869ac1843dadc5e6bc769d0869 (patch) | |
| tree | 7e81d796d6be11b3a6e302b58c729a87d353a143 /build/gyp_chromium | |
| parent | 8018c2d87872073c3e5a8c7d3fe1289796bda3e8 (diff) | |
| download | chromium_src-3ad0946b31fa66869ac1843dadc5e6bc769d0869.zip chromium_src-3ad0946b31fa66869ac1843dadc5e6bc769d0869.tar.gz chromium_src-3ad0946b31fa66869ac1843dadc5e6bc769d0869.tar.bz2 | |
GN: Work on Linux build defines
This makes the -D defines for the default desktop Linux build of re2 in GN match that of GYP.
This moves the SSL configuration stuff into the root build directory. It's better to match the GYP build exactly for ease of landing even though this is a stupid dependency.
Fixes the help text that still references the implicit "gen" command (I removed this).
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/170533003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index a158f39..ec400e1 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -207,6 +207,10 @@ def GetArgsStringForGN(vars_dict): ('clang', '1', 'is_clang=true'), ('clang_use_chrome_plugins', '0', 'clang_use_chrome_plugins=false'), ('disable_glibcxx_debug', '1', 'disable_iterator_debugging=true'), + ('enable_mdns', '0', 'enable_mdns=false'), + ('enable_mdns', '1', 'enable_mdns=true'), + ('enable_plugins', '0', 'enable_plugins=false'), + ('enable_plugins', '1', 'enable_plugins=true'), ('target_arch', 'ia32', 'cpu_arch="x86"'), ('target_arch', 'x64', 'cpu_arch="x64" force_win64=true'), ('target_arch', 'arm', 'cpu_arch="arm"'), @@ -219,6 +223,8 @@ def GetArgsStringForGN(vars_dict): ('chromeos', '1', 'os="chromeos"'), ('use_aura', '1', 'use_aura=true'), ('use_goma', '1', 'use_goma=true'), + ('use_openssl', '0', 'use_openssl=false'), + ('use_openssl', '1', 'use_openssl=true'), ('asan', '1', 'is_asan=true'), ('lsan', '1', 'is_lsan=true'), ('msan', '1', 'is_msan=true'), |