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

Side by Side Diff: build/common.gypi

Issue 63823003: Remove global #define WebKit blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 1919 matching lines...) Expand 10 before | Expand all | Expand 10 after
1930 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l 1930 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l
1931 'mac_release_optimization%': '3', # Use -O3 unless overridden 1931 'mac_release_optimization%': '3', # Use -O3 unless overridden
1932 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1932 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1933 }], 1933 }],
1934 ], 1934 ],
1935 }, 1935 },
1936 'defines': [ 1936 'defines': [
1937 # Set this to use the new DX11 version of ANGLE. 1937 # Set this to use the new DX11 version of ANGLE.
1938 # TODO(apatrick): Remove this when the transition is complete. 1938 # TODO(apatrick): Remove this when the transition is complete.
1939 'ANGLE_DX11', 1939 'ANGLE_DX11',
1940 # We're in the process of renaming the WebKit namespace to blink.
1941 # TODO(abarth): Remove this define when we've updated the code.
1942 # See https://code.google.com/p/chromium/issues/detail?id=295096
1943 'WebKit=blink',
1944 ], 1940 ],
1945 'conditions': [ 1941 'conditions': [
1946 ['(OS=="mac" or OS=="ios") and asan==1', { 1942 ['(OS=="mac" or OS=="ios") and asan==1', {
1947 'dependencies': [ 1943 'dependencies': [
1948 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', 1944 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
1949 ], 1945 ],
1950 }], 1946 }],
1951 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { 1947 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
1952 'cflags_cc!': ['-fno-rtti'], 1948 'cflags_cc!': ['-fno-rtti'],
1953 'cflags_cc+': [ 1949 'cflags_cc+': [
(...skipping 2737 matching lines...) Expand 10 before | Expand all | Expand 10 after
4691 # settings in target dicts. SYMROOT is a special case, because many other 4687 # settings in target dicts. SYMROOT is a special case, because many other
4692 # Xcode variables depend on it, including variables such as 4688 # Xcode variables depend on it, including variables such as
4693 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4689 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4694 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4690 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4695 # files to appear (when present) in the UI as actual files and not red 4691 # files to appear (when present) in the UI as actual files and not red
4696 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4692 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4697 # and therefore SYMROOT, needs to be set at the project level. 4693 # and therefore SYMROOT, needs to be set at the project level.
4698 'SYMROOT': '<(DEPTH)/xcodebuild', 4694 'SYMROOT': '<(DEPTH)/xcodebuild',
4699 }, 4695 },
4700 } 4696 }
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