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 /chromecast | |
| 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 'chromecast')
| -rw-r--r-- | chromecast/BUILD.gn | 5 | ||||
| -rw-r--r-- | chromecast/chromecast.gni | 3 | ||||
| -rw-r--r-- | chromecast/chromecast_tests.gypi | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn index bc1a8a0..4a93980 100644 --- a/chromecast/BUILD.gn +++ b/chromecast/BUILD.gn @@ -50,7 +50,8 @@ cast_test_group("cast_tests") { filters = [] - if (target_cpu == "arm" && target_os == "linux") { + # Apply filters to embedded linux devices. + if (target_os == "linux" && !is_cast_desktop_build) { filters += [ # Run net_unittests first to avoid random failures due to slow python startup # KeygenHandlerTest.SmokeTest and KeygenHandlerTest.ConcurrencyTest fail due to @@ -94,7 +95,7 @@ cast_test_group("cast_tests") { # DoAppendUTF8Invalid fails because of dcheck_always_on flag in Eng builds "url_unittests --gtest_filter=-URLCanonTest.DoAppendUTF8Invalid", ] - } else if (target_cpu != "arm" || target_os == "android") { + } else if (is_cast_desktop_build || target_os == "android") { filters += [ # Disable PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM (not supported) "media_unittests --gtest_filter=-PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM", diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni index fa36ec9..7c2c776 100644 --- a/chromecast/chromecast.gni +++ b/chromecast/chromecast.gni @@ -12,9 +12,6 @@ declare_args() { # Set it to "public" for a Chromium build. chromecast_branding = "public" - # True if Chromecast build is targetted for linux desktop. - is_chromecast_desktop_build = is_linux && target_cpu != "arm" - # Use Playready CDMs. use_playready = false } diff --git a/chromecast/chromecast_tests.gypi b/chromecast/chromecast_tests.gypi index c889bbc..fb373fb 100644 --- a/chromecast/chromecast_tests.gypi +++ b/chromecast/chromecast_tests.gypi @@ -111,7 +111,7 @@ '../url/url.gyp:url_unittests', ], 'conditions': [ - ['target_arch=="arm" and OS!="android"', { + ['OS=="linux" and is_cast_desktop_build==0', { 'variables': { 'filters': [ # Run net_unittests first to avoid random failures due to slow python startup @@ -153,7 +153,7 @@ 'url_unittests --gtest_filter=-URLCanonTest.DoAppendUTF8Invalid', ], }, - }, { # else "x86" or "android" + }, { # else desktop or android 'variables': { 'filters': [ # Disable PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM (not supported) |