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

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
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 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 'chromium_win_pch': 0, 1894 'chromium_win_pch': 0,
1895 # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1. 1895 # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1.
1896 'conditions': [ 1896 'conditions': [
1897 ['fastbuild==0', { 1897 ['fastbuild==0', {
1898 'win_z7': 1, 1898 'win_z7': 1,
1899 }], 1899 }],
1900 ], 1900 ],
1901 }], 1901 }],
1902 ], 1902 ],
1903 1903
1904 1904 # The path to the ANGLE library. TODO(geofflang): This is to help
1905 # The path to the ANGLE library. TODO(apatrick): This is to help
1906 # transition to a new version of ANGLE at a new location. After the 1905 # transition to a new version of ANGLE at a new location. After the
1907 # transition is complete, this can be removed. 1906 # transition is complete, this can be removed.
1908 'angle_path': '<(DEPTH)/third_party/angle_dx11', 1907 'angle_path': '<(DEPTH)/third_party/angle',
1909 1908
1910 # List of default apps to install in new profiles. The first list contains 1909 # List of default apps to install in new profiles. The first list contains
1911 # the source files as found in svn. The second list, used only for linux, 1910 # the source files as found in svn. The second list, used only for linux,
1912 # contains the destination location for each of the files. When a crx 1911 # contains the destination location for each of the files. When a crx
1913 # is added or removed from the list, the chrome/browser/resources/ 1912 # is added or removed from the list, the chrome/browser/resources/
1914 # default_apps/external_extensions.json file must also be updated. 1913 # default_apps/external_extensions.json file must also be updated.
1915 'default_apps_list': [ 1914 'default_apps_list': [
1916 'browser/resources/default_apps/external_extensions.json', 1915 'browser/resources/default_apps/external_extensions.json',
1917 'browser/resources/default_apps/gmail.crx', 1916 'browser/resources/default_apps/gmail.crx',
1918 'browser/resources/default_apps/search.crx', 1917 'browser/resources/default_apps/search.crx',
(...skipping 2877 matching lines...) Expand 10 before | Expand all | Expand 10 after
4796 # settings in target dicts. SYMROOT is a special case, because many other 4795 # settings in target dicts. SYMROOT is a special case, because many other
4797 # Xcode variables depend on it, including variables such as 4796 # Xcode variables depend on it, including variables such as
4798 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4797 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4798 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4800 # files to appear (when present) in the UI as actual files and not red 4799 # files to appear (when present) in the UI as actual files and not red
4801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4800 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4802 # and therefore SYMROOT, needs to be set at the project level. 4801 # and therefore SYMROOT, needs to be set at the project level.
4803 'SYMROOT': '<(DEPTH)/xcodebuild', 4802 'SYMROOT': '<(DEPTH)/xcodebuild',
4804 }, 4803 },
4805 } 4804 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698