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

Side by Side Diff: build/common.gypi

Issue 604413002: Add a temporary variable to store ANGLE gyp file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« 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 2321 matching lines...) Expand 10 before | Expand all | Expand 10 after
2332 'target_arch=="arm64"))', { 2332 'target_arch=="arm64"))', {
2333 'use_seccomp_bpf%': 1, 2333 'use_seccomp_bpf%': 1,
2334 }, { 2334 }, {
2335 'use_seccomp_bpf%': 0, 2335 'use_seccomp_bpf%': 0,
2336 }], 2336 }],
2337 ], 2337 ],
2338 2338
2339 # The path to the ANGLE library. 2339 # The path to the ANGLE library.
2340 'angle_path': '<(DEPTH)/third_party/angle', 2340 'angle_path': '<(DEPTH)/third_party/angle',
2341 2341
2342 # TODO(jmadill): remove angle_gyp. http://crbug.com/415983
2343 # This temporary variable lets us change the name of the gyp file
2344 # in blink and in chromium simultaneously. It should go away after
2345 # we're done changing the path.
2346 'angle_gyp': 'build_angle.gyp',
2347
2342 # List of default apps to install in new profiles. The first list contains 2348 # List of default apps to install in new profiles. The first list contains
2343 # the source files as found in svn. The second list, used only for linux, 2349 # the source files as found in svn. The second list, used only for linux,
2344 # contains the destination location for each of the files. When a crx 2350 # contains the destination location for each of the files. When a crx
2345 # is added or removed from the list, the chrome/browser/resources/ 2351 # is added or removed from the list, the chrome/browser/resources/
2346 # default_apps/external_extensions.json file must also be updated. 2352 # default_apps/external_extensions.json file must also be updated.
2347 'default_apps_list': [ 2353 'default_apps_list': [
2348 'browser/resources/default_apps/external_extensions.json', 2354 'browser/resources/default_apps/external_extensions.json',
2349 'browser/resources/default_apps/gmail.crx', 2355 'browser/resources/default_apps/gmail.crx',
2350 'browser/resources/default_apps/search.crx', 2356 'browser/resources/default_apps/search.crx',
2351 'browser/resources/default_apps/youtube.crx', 2357 'browser/resources/default_apps/youtube.crx',
(...skipping 3422 matching lines...) Expand 10 before | Expand all | Expand 10 after
5774 # settings in target dicts. SYMROOT is a special case, because many other 5780 # settings in target dicts. SYMROOT is a special case, because many other
5775 # Xcode variables depend on it, including variables such as 5781 # Xcode variables depend on it, including variables such as
5776 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5782 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5777 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5783 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5778 # files to appear (when present) in the UI as actual files and not red 5784 # files to appear (when present) in the UI as actual files and not red
5779 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5785 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5780 # and therefore SYMROOT, needs to be set at the project level. 5786 # and therefore SYMROOT, needs to be set at the project level.
5781 'SYMROOT': '<(DEPTH)/xcodebuild', 5787 'SYMROOT': '<(DEPTH)/xcodebuild',
5782 }, 5788 },
5783 } 5789 }
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