|
|
Created:
7 years, 1 month ago by spang Modified:
7 years, 1 month ago CC:
chromium-reviews, ozone-dev_chromium.org, Mostyn Bramley-Moore, rogerj Base URL:
svn://svn.chromium.org/chrome/trunk/src Visibility:
Public. |
Descriptionozone: Add "embedded" build configuration
This flag merely disables some features by default.
BUG=318413
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=235026
Patch Set 1 #Patch Set 2 : embedded implies ozone #Patch Set 3 : fix evdev linkage #
Total comments: 1
Messages
Total messages: 11 (0 generated)
https://codereview.chromium.org/71023002/diff/70001/build/common.gypi File build/common.gypi (right): https://codereview.chromium.org/71023002/diff/70001/build/common.gypi#newcode114 build/common.gypi:114: # Embedded implies ozone. Shouldn't it be the other way around? ozone implies embedded?
On 2013/11/13 08:28:47, Mostyn Bramley-Moore wrote: > https://codereview.chromium.org/71023002/diff/70001/build/common.gypi > File build/common.gypi (right): > > https://codereview.chromium.org/71023002/diff/70001/build/common.gypi#newcode114 > build/common.gypi:114: # Embedded implies ozone. > Shouldn't it be the other way around? ozone implies embedded? I don't think so. There are places where ozone=1 for !embedded -- Chromium Wayland for example. ozone is a porting meta-platform. For embedded. But also for other other uses.
lgtm
On 2013/11/13 08:28:47, Mostyn Bramley-Moore wrote: > https://codereview.chromium.org/71023002/diff/70001/build/common.gypi > File build/common.gypi (right): > > https://codereview.chromium.org/71023002/diff/70001/build/common.gypi#newcode114 > build/common.gypi:114: # Embedded implies ozone. > Shouldn't it be the other way around? ozone implies embedded? ozone can be used for desktop; it is just a way to implement graphics and events support. Wayland is doing this. We should not have use_ozone=1 drastically change the default build configuration. Embedded is a new flag for things like chromecast. It requires ozone mainly because use_ozone==0 currently implies X, and like chromecast, I expect most embedded platforms would like to avoid X. The way to get graphics output with the fewest possible dependencies is to use ozone.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/spang@chromium.org/71023002/70001
Failed to apply patch for build/common.gypi: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file build/common.gypi Hunk #9 FAILED at 521. Hunk #10 succeeded at 654 (offset -7 lines). Hunk #11 succeeded at 774 (offset -7 lines). Hunk #12 succeeded at 1591 (offset -8 lines). 1 out of 12 hunks FAILED -- saving rejects to file build/common.gypi.rej Patch: build/common.gypi Index: build/common.gypi diff --git a/build/common.gypi b/build/common.gypi index 751342ef40e488f83989844b3f9851cd7f13d0c8..5db3c4ce895b4e5246f37ed8f6879788c9a6f097 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -32,6 +32,9 @@ # Use a raw surface abstraction. 'use_ozone%': 0, + + # Configure the build for small devices. See crbug.com/318413 + 'embedded%': 0, }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', @@ -39,7 +42,7 @@ 'use_ash%': '<(use_ash)', 'use_cras%': '<(use_cras)', 'use_ozone%': '<(use_ozone)', - 'use_ozone_evdev%': '<(use_ozone)', + 'embedded%': '<(embedded)', # Whether we are using Views Toolkit 'toolkit_views%': 0, @@ -76,6 +79,11 @@ 'use_aura%': 1, }], + # Ozone uses Aura. + ['use_ozone==1', { + 'use_aura%': 1, + }], + # ToT Linux should be aura. # # TODO(erg): Merge this into the previous block once compiling with @@ -102,6 +110,11 @@ 'host_arch%': '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")', }], + + # Embedded implies ozone. + ['embedded==1', { + 'use_ozone%': 1, + }], ], }, # Copy conditionally-set variables out one scope. @@ -111,7 +124,7 @@ 'use_ash%': '<(use_ash)', 'use_cras%': '<(use_cras)', 'use_ozone%': '<(use_ozone)', - 'use_ozone_evdev%': '<(use_ozone_evdev)', + 'embedded%': '<(embedded)', 'use_openssl%': '<(use_openssl)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', @@ -149,6 +162,13 @@ 'toolkit_views%': 0, }], + # Embedded builds use aura without ash or views. + ['embedded==1', { + 'use_aura%': 1, + 'use_ash%': 0, + 'toolkit_views%': 0, + }], + # Set toolkit_uses_gtk for the Chromium browser on Linux. ['desktop_linux==1 and use_aura==0 and use_ozone==0', { 'toolkit_uses_gtk%': 1, @@ -179,6 +199,12 @@ }, { 'use_default_render_theme%': 0, }], + + ['use_ozone==1', { + 'use_ozone_evdev%': 1, + }, { + 'use_ozone_evdev%': 0, + }] ], }, @@ -194,6 +220,7 @@ 'use_cras%': '<(use_cras)', 'use_ozone%': '<(use_ozone)', 'use_ozone_evdev%': '<(use_ozone_evdev)', + 'embedded%': '<(embedded)', 'use_openssl%': '<(use_openssl)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', @@ -494,17 +521,22 @@ 'use_x11%': 1, }], - # Flags to use pango and glib on non-Mac POSIX platforms. + # Flags to use glib. ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 'use_glib%': 0, - 'use_pango%': 0, }, { 'use_glib%': 1, + }], + + # Flags to use pango. + ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { + 'use_pango%': 0, + }, { 'use_pango%': 1, }], # DBus usage. - ['OS=="linux"', { + ['OS=="linux" and embedded==0', { 'use_dbus%': 1, }, { 'use_dbus%': 0, @@ -634,7 +666,7 @@ 'enable_plugin_installation%': 1, }], - ['(OS=="android" and google_tv!=1) or OS=="ios"', { + ['(OS=="android" and google_tv!=1) or OS=="ios" or embedded==1', { 'enable_plugins%': 0, }, { 'enable_plugins%': 1, @@ -754,6 +786,12 @@ }, { 'v8_optimized_debug%': 2, }], + + # Disable various features by default on embedded. + ['embedded==1', { + 'remoting%': 0, + 'enable_printing%': 0, + }], ], # Set this to 1 to enable use of concatenated impulse responses @@ -1566,7 +1604,7 @@ # Options controlling the use of GConf (the classic GNOME configuration # system) and GIO, which contains GSettings (the new GNOME config system). - ['chromeos==1', { + ['chromeos==1 or embedded==1', { 'use_gconf%': 0, 'use_gio%': 0, }, {
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/spang@chromium.org/71023002/70001
Retried try job too often on chromium_presubmit for step(s) presubmit http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/spang@chromium.org/71023002/70001
Message was sent while issue was closed.
Change committed as 235026 |