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

Side by Side Diff: build/common.gypi

Issue 14495017: Turn on ENABLE_PLUGIN_INSTALLATION flag for Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest merge Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 'ui_compositor_image_transport%': 1, 542 'ui_compositor_image_transport%': 1,
543 }, { 543 }, {
544 'ui_compositor_image_transport%': 0, 544 'ui_compositor_image_transport%': 0,
545 }], 545 }],
546 546
547 # Turn precompiled headers on by default. 547 # Turn precompiled headers on by default.
548 ['OS=="win" and buildtype!="Official"', { 548 ['OS=="win" and buildtype!="Official"', {
549 'chromium_win_pch%': 1 549 'chromium_win_pch%': 1
550 }], 550 }],
551 551
552 ['use_aura==1 or chromeos==1 or OS=="android" or OS=="ios"', { 552 ['chromeos==1 or OS=="android" or OS=="ios"', {
553 'enable_plugin_installation%': 0, 553 'enable_plugin_installation%': 0,
554 }, { 554 }, {
555 'enable_plugin_installation%': 1, 555 'enable_plugin_installation%': 1,
556 }], 556 }],
557 557
558 ['(OS=="android" and google_tv!=1) or OS=="ios"', { 558 ['(OS=="android" and google_tv!=1) or OS=="ios"', {
559 'enable_plugins%': 0, 559 'enable_plugins%': 0,
560 }, { 560 }, {
561 'enable_plugins%': 1, 561 'enable_plugins%': 1,
562 }], 562 }],
(...skipping 3873 matching lines...) Expand 10 before | Expand all | Expand 10 after
4436 # settings in target dicts. SYMROOT is a special case, because many other 4436 # settings in target dicts. SYMROOT is a special case, because many other
4437 # Xcode variables depend on it, including variables such as 4437 # Xcode variables depend on it, including variables such as
4438 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4438 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4439 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4439 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4440 # files to appear (when present) in the UI as actual files and not red 4440 # files to appear (when present) in the UI as actual files and not red
4441 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4441 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4442 # and therefore SYMROOT, needs to be set at the project level. 4442 # and therefore SYMROOT, needs to be set at the project level.
4443 'SYMROOT': '<(DEPTH)/xcodebuild', 4443 'SYMROOT': '<(DEPTH)/xcodebuild',
4444 }, 4444 },
4445 } 4445 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698