Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Side by Side Diff: build/common.gypi

Issue 569623002: Switch ChromeOS Chromium login to use IJG libjpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on ToT Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 882
883 # Enable Skia UI text drawing incrementally on different platforms. 883 # Enable Skia UI text drawing incrementally on different platforms.
884 # http://crbug.com/105550 884 # http://crbug.com/105550
885 # 885 #
886 # On Aura, this allows per-tile painting to be used in the browser 886 # On Aura, this allows per-tile painting to be used in the browser
887 # compositor. 887 # compositor.
888 ['OS!="android"', { 888 ['OS!="android"', {
889 'use_canvas_skia%': 1, 889 'use_canvas_skia%': 1,
890 }], 890 }],
891 891
892 ['chromeos==1', {
893 # When building for ChromeOS we dont want Chromium to use libjpeg_turb o.
894 'use_libjpeg_turbo%': 0,
895 }],
896
897 # Do not enable the Settings App on ChromeOS. 892 # Do not enable the Settings App on ChromeOS.
898 ['enable_app_list==1 and chromeos==0', { 893 ['enable_app_list==1 and chromeos==0', {
899 'enable_settings_app%': 1, 894 'enable_settings_app%': 1,
900 }, { 895 }, {
901 'enable_settings_app%': 0, 896 'enable_settings_app%': 0,
902 }], 897 }],
903 898
904 ['OS=="linux" and target_arch=="arm" and chromeos==0', { 899 ['OS=="linux" and target_arch=="arm" and chromeos==0', {
905 # Set some defaults for arm/linux chrome builds 900 # Set some defaults for arm/linux chrome builds
906 'use_allocator%': 'none', 901 'use_allocator%': 'none',
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1498 1493
1499 # Chrome OS: whether to build ChromeVox from sources in the Chromium 1494 # Chrome OS: whether to build ChromeVox from sources in the Chromium
1500 # repository rather than using precompiled JavaScript in 1495 # repository rather than using precompiled JavaScript in
1501 # chrome/third_party/chromevox. This is still experimental. 1496 # chrome/third_party/chromevox. This is still experimental.
1502 'use_migrated_chromevox%': 1, 1497 'use_migrated_chromevox%': 1,
1503 1498
1504 # Chrome OS: whether to also build the upcoming version of 1499 # Chrome OS: whether to also build the upcoming version of
1505 # ChromeVox, which can then be enabled via a command-line switch. 1500 # ChromeVox, which can then be enabled via a command-line switch.
1506 'use_chromevox_next%': 0, 1501 'use_chromevox_next%': 0,
1507 1502
1503 # Used to set libjpeg_gyp_path. Chrome OS ui/gfx/gfx.gyp uses the IJG path
1504 # for robust login screen decoding.
1505 'libjpeg_ijg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
1506 'libjpeg_turbo_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
1507
1508 'conditions': [ 1508 'conditions': [
1509 # Enable the Syzygy optimization step for the official builds. 1509 # Enable the Syzygy optimization step for the official builds.
1510 ['OS=="win" and buildtype=="Official" and syzyasan!=1', { 1510 ['OS=="win" and buildtype=="Official" and syzyasan!=1', {
1511 'syzygy_optimize%': 1, 1511 'syzygy_optimize%': 1,
1512 }, { 1512 }, {
1513 'syzygy_optimize%': 0, 1513 'syzygy_optimize%': 0,
1514 }], 1514 }],
1515 # Get binutils version so we can enable debug fission if we can. 1515 # Get binutils version so we can enable debug fission if we can.
1516 ['os_posix==1 and OS!="mac" and OS!="ios"', { 1516 ['os_posix==1 and OS!="mac" and OS!="ios"', {
1517 'conditions': [ 1517 'conditions': [
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
1984 ['target_arch=="arm" or target_arch=="mipsel" or target_arch=="mips64el"', { 1984 ['target_arch=="arm" or target_arch=="mipsel" or target_arch=="mips64el"', {
1985 'disable_glibc%': 1, 1985 'disable_glibc%': 1,
1986 }, { 1986 }, {
1987 'disable_glibc%': 0, 1987 'disable_glibc%': 0,
1988 }], 1988 }],
1989 1989
1990 # Set the relative path from this file to the GYP file of the JPEG 1990 # Set the relative path from this file to the GYP file of the JPEG
1991 # library used by Chromium. 1991 # library used by Chromium.
1992 ['use_system_libjpeg==1 or use_libjpeg_turbo==0', { 1992 ['use_system_libjpeg==1 or use_libjpeg_turbo==0', {
1993 # Configuration for using the system libjeg is here. 1993 # Configuration for using the system libjeg is here.
1994 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', 1994 'libjpeg_gyp_path': '<(libjpeg_ijg_gyp_path)',
1995 }, { 1995 }, {
1996 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', 1996 'libjpeg_gyp_path': '<(libjpeg_turbo_gyp_path)',
1997 }], 1997 }],
1998 1998
1999 # Options controlling the use of GConf (the classic GNOME configuration 1999 # Options controlling the use of GConf (the classic GNOME configuration
2000 # system) and GIO, which contains GSettings (the new GNOME config system). 2000 # system) and GIO, which contains GSettings (the new GNOME config system).
2001 ['chromeos==1 or embedded==1', { 2001 ['chromeos==1 or embedded==1', {
2002 'use_gconf%': 0, 2002 'use_gconf%': 0,
2003 'use_gio%': 0, 2003 'use_gio%': 0,
2004 }, { 2004 }, {
2005 'use_gconf%': 1, 2005 'use_gconf%': 1,
2006 'use_gio%': 1, 2006 'use_gio%': 1,
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
2584 }], 2584 }],
2585 ['use_glib==1', { 2585 ['use_glib==1', {
2586 'defines': ['USE_GLIB=1'], 2586 'defines': ['USE_GLIB=1'],
2587 }], 2587 }],
2588 ['use_ozone==1', { 2588 ['use_ozone==1', {
2589 'defines': ['USE_OZONE=1'], 2589 'defines': ['USE_OZONE=1'],
2590 }], 2590 }],
2591 ['use_default_render_theme==1', { 2591 ['use_default_render_theme==1', {
2592 'defines': ['USE_DEFAULT_RENDER_THEME=1'], 2592 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
2593 }], 2593 }],
2594 ['use_libjpeg_turbo==1', { 2594 ['use_libjpeg_turbo==1 and chromeos!=1', {
2595 # Only used by ui/gfx/codec/jpeg_codec.cc. Chrome OS requires IJG for
2596 # robustly decoding login screen images.
2595 'defines': ['USE_LIBJPEG_TURBO=1'], 2597 'defines': ['USE_LIBJPEG_TURBO=1'],
2596 }], 2598 }],
2597 ['use_x11==1', { 2599 ['use_x11==1', {
2598 'defines': ['USE_X11=1'], 2600 'defines': ['USE_X11=1'],
2599 }], 2601 }],
2600 ['use_clipboard_aurax11==1', { 2602 ['use_clipboard_aurax11==1', {
2601 'defines': ['USE_CLIPBOARD_AURAX11=1'], 2603 'defines': ['USE_CLIPBOARD_AURAX11=1'],
2602 }], 2604 }],
2603 ['enable_one_click_signin==1', { 2605 ['enable_one_click_signin==1', {
2604 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 2606 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
(...skipping 3174 matching lines...) Expand 10 before | Expand all | Expand 10 after
5779 # settings in target dicts. SYMROOT is a special case, because many other 5781 # settings in target dicts. SYMROOT is a special case, because many other
5780 # Xcode variables depend on it, including variables such as 5782 # Xcode variables depend on it, including variables such as
5781 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5783 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5782 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5784 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5783 # files to appear (when present) in the UI as actual files and not red 5785 # files to appear (when present) in the UI as actual files and not red
5784 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5786 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5785 # and therefore SYMROOT, needs to be set at the project level. 5787 # and therefore SYMROOT, needs to be set at the project level.
5786 'SYMROOT': '<(DEPTH)/xcodebuild', 5788 'SYMROOT': '<(DEPTH)/xcodebuild',
5787 }, 5789 },
5788 } 5790 }
OLDNEW
« no previous file with comments | « AUTHORS ('k') | third_party/BUILD.gn » ('j') | third_party/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698