diff options
| author | slan <slan@chromium.org> | 2015-12-15 21:08:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-16 05:09:45 +0000 |
| commit | 5fcffc49276168c1e80ca5f0ba6d1c13fdd8dd02 (patch) | |
| tree | 640e090d824e88acb8bb8d8d29e4f43829af2601 /build/common.gypi | |
| parent | 268de1c7f1fe74961291f6abc861a3e569642791 (diff) | |
| download | chromium_src-5fcffc49276168c1e80ca5f0ba6d1c13fdd8dd02.zip chromium_src-5fcffc49276168c1e80ca5f0ba6d1c13fdd8dd02.tar.gz chromium_src-5fcffc49276168c1e80ca5f0ba6d1c13fdd8dd02.tar.bz2 | |
[Chromecast] Replace architecture-based conditionals with flag.
Chromecast has historically used the target architecture as a proxy for
the type of device targeted (embedded vs. desktop). Looking to the
future, the decisions should be made on a per-feature basis and should
be independent of the architecture. Replace each of the architecture
conditionals with a flag that indicates Cast is being built for desktop.
BUG=
Review URL: https://codereview.chromium.org/1528533002
Cr-Commit-Position: refs/heads/master@{#365452}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index b81acbe..800cefe 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -233,6 +233,13 @@ 'toolkit_views%': 0, }], + # Chromecast builds on x86 Linux should default to desktop builds. + ['chromecast==1 and OS=="linux" and (target_arch=="ia32" or target_arch=="x64")', { + 'is_cast_desktop_build%': 1, + }, { + 'is_cast_desktop_build%': 0, + }], + # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS). ['OS=="mac" or OS=="win" or OS=="linux"', { 'enable_hidpi%': 1, @@ -322,6 +329,7 @@ # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', 'chromecast%': '<(chromecast)', + 'is_cast_desktop_build%': '<(is_cast_desktop_build)', 'host_arch%': '<(host_arch)', 'target_arch%': '<(target_arch)', 'target_subarch%': '<(target_subarch)', @@ -1137,6 +1145,7 @@ 'linux_fpic%': '<(linux_fpic)', 'chromeos%': '<(chromeos)', 'chromecast%': '<(chromecast)', + 'is_cast_desktop_build%': '<(is_cast_desktop_build)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', 'enable_topchrome_md%': '<(enable_topchrome_md)', @@ -2392,7 +2401,7 @@ # TODO(slan|halliwell): Make the default platform "cast" on # desktop too. 'conditions': [ - ['OS=="linux" and target_arch!="arm"', { + ['is_cast_desktop_build==1', { 'ozone_platform_egltest%': 1, 'ozone_platform_ozonex%': 1, }, { |