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

Side by Side Diff: build/common.gypi

Issue 106623003: Update dependencies to use new angle repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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
« no previous file with comments | « build/all.gyp ('k') | content/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 1895 matching lines...) Expand 10 before | Expand all | Expand 10 after
1906 'chromium_win_pch': 0, 1906 'chromium_win_pch': 0,
1907 # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1. 1907 # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1.
1908 'conditions': [ 1908 'conditions': [
1909 ['fastbuild==0', { 1909 ['fastbuild==0', {
1910 'win_z7': 1, 1910 'win_z7': 1,
1911 }], 1911 }],
1912 ], 1912 ],
1913 }], 1913 }],
1914 ], 1914 ],
1915 1915
1916 1916 # The path to the ANGLE library.
1917 # The path to the ANGLE library. TODO(apatrick): This is to help 1917 'angle_path': '<(DEPTH)/third_party/angle',
1918 # transition to a new version of ANGLE at a new location. After the
1919 # transition is complete, this can be removed.
1920 'angle_path': '<(DEPTH)/third_party/angle_dx11',
1921 1918
1922 # List of default apps to install in new profiles. The first list contains 1919 # List of default apps to install in new profiles. The first list contains
1923 # the source files as found in svn. The second list, used only for linux, 1920 # the source files as found in svn. The second list, used only for linux,
1924 # contains the destination location for each of the files. When a crx 1921 # contains the destination location for each of the files. When a crx
1925 # is added or removed from the list, the chrome/browser/resources/ 1922 # is added or removed from the list, the chrome/browser/resources/
1926 # default_apps/external_extensions.json file must also be updated. 1923 # default_apps/external_extensions.json file must also be updated.
1927 'default_apps_list': [ 1924 'default_apps_list': [
1928 'browser/resources/default_apps/external_extensions.json', 1925 'browser/resources/default_apps/external_extensions.json',
1929 'browser/resources/default_apps/gmail.crx', 1926 'browser/resources/default_apps/gmail.crx',
1930 'browser/resources/default_apps/search.crx', 1927 'browser/resources/default_apps/search.crx',
(...skipping 2876 matching lines...) Expand 10 before | Expand all | Expand 10 after
4807 # settings in target dicts. SYMROOT is a special case, because many other 4804 # settings in target dicts. SYMROOT is a special case, because many other
4808 # Xcode variables depend on it, including variables such as 4805 # Xcode variables depend on it, including variables such as
4809 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4806 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4810 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4807 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4811 # files to appear (when present) in the UI as actual files and not red 4808 # files to appear (when present) in the UI as actual files and not red
4812 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4809 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4813 # and therefore SYMROOT, needs to be set at the project level. 4810 # and therefore SYMROOT, needs to be set at the project level.
4814 'SYMROOT': '<(DEPTH)/xcodebuild', 4811 'SYMROOT': '<(DEPTH)/xcodebuild',
4815 }, 4812 },
4816 } 4813 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | content/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698