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

Side by Side Diff: build/common.gypi

Issue 10886050: Add code to insure we are using the correct library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed DEPS Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/gfx/codec/DEPS » ('j') | 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 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 'test_isolation_mode%': '<(test_isolation_mode)', 603 'test_isolation_mode%': '<(test_isolation_mode)',
604 'test_isolation_outdir%': '<(test_isolation_outdir)', 604 'test_isolation_outdir%': '<(test_isolation_outdir)',
605 'enable_automation%': '<(enable_automation)', 605 'enable_automation%': '<(enable_automation)',
606 'enable_printing%': '<(enable_printing)', 606 'enable_printing%': '<(enable_printing)',
607 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 607 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
608 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 608 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
609 'enable_task_manager%': '<(enable_task_manager)', 609 'enable_task_manager%': '<(enable_task_manager)',
610 'sas_dll_path%': '<(sas_dll_path)', 610 'sas_dll_path%': '<(sas_dll_path)',
611 'wix_path%': '<(wix_path)', 611 'wix_path%': '<(wix_path)',
612 'android_upstream_bringup%': '<(android_upstream_bringup)', 612 'android_upstream_bringup%': '<(android_upstream_bringup)',
613 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
613 'use_system_libjpeg%': '<(use_system_libjpeg)', 614 'use_system_libjpeg%': '<(use_system_libjpeg)',
614 'android_build_type%': '<(android_build_type)', 615 'android_build_type%': '<(android_build_type)',
615 616
616 # Use system yasm instead of bundled one. 617 # Use system yasm instead of bundled one.
617 'use_system_yasm%': 0, 618 'use_system_yasm%': 0,
618 619
619 # Default to enabled PIE; this is important for ASLR but we may need to be 620 # Default to enabled PIE; this is important for ASLR but we may need to be
620 # able to turn it off for various reasons. 621 # able to turn it off for various reasons.
621 'linux_disable_pie%': 0, 622 'linux_disable_pie%': 0,
622 623
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 }], 1392 }],
1392 ['ui_compositor_image_transport==1', { 1393 ['ui_compositor_image_transport==1', {
1393 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1394 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1394 }], 1395 }],
1395 ['use_aura==1', { 1396 ['use_aura==1', {
1396 'defines': ['USE_AURA=1'], 1397 'defines': ['USE_AURA=1'],
1397 }], 1398 }],
1398 ['use_ash==1', { 1399 ['use_ash==1', {
1399 'defines': ['USE_ASH=1'], 1400 'defines': ['USE_ASH=1'],
1400 }], 1401 }],
1402 ['use_libjpeg_turbo==1', {
1403 'defines': ['USE_LIBJPEG_TURBO=1'],
1404 }],
1401 ['use_nss==1', { 1405 ['use_nss==1', {
1402 'defines': ['USE_NSS=1'], 1406 'defines': ['USE_NSS=1'],
1403 }], 1407 }],
1404 ['enable_one_click_signin==1', { 1408 ['enable_one_click_signin==1', {
1405 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 1409 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
1406 }], 1410 }],
1407 ['toolkit_uses_gtk==1 and toolkit_views==0', { 1411 ['toolkit_uses_gtk==1 and toolkit_views==0', {
1408 # TODO(erg): We are progressively sealing up use of deprecated features 1412 # TODO(erg): We are progressively sealing up use of deprecated features
1409 # in gtk in preparation for an eventual porting to gtk3. 1413 # in gtk in preparation for an eventual porting to gtk3.
1410 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 1414 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
(...skipping 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after
3419 # settings in target dicts. SYMROOT is a special case, because many other 3423 # settings in target dicts. SYMROOT is a special case, because many other
3420 # Xcode variables depend on it, including variables such as 3424 # Xcode variables depend on it, including variables such as
3421 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3425 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3422 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3426 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3423 # files to appear (when present) in the UI as actual files and not red 3427 # files to appear (when present) in the UI as actual files and not red
3424 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3428 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3425 # and therefore SYMROOT, needs to be set at the project level. 3429 # and therefore SYMROOT, needs to be set at the project level.
3426 'SYMROOT': '<(DEPTH)/xcodebuild', 3430 'SYMROOT': '<(DEPTH)/xcodebuild',
3427 }, 3431 },
3428 } 3432 }
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/codec/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698