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

Side by Side Diff: build/common.gypi

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase Created 5 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
« no previous file with comments | « WATCHLISTS ('k') | build/linux/unbundle/replace_gyp_files.py » ('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 4737 matching lines...) Expand 10 before | Expand all | Expand 10 after
4748 # This is a unique identifier for a given build. It's used for 4748 # This is a unique identifier for a given build. It's used for
4749 # identifying various build artifacts corresponding to a particular 4749 # identifying various build artifacts corresponding to a particular
4750 # build of chrome (e.g. where to find archived symbols). 4750 # build of chrome (e.g. where to find archived symbols).
4751 'chrome_build_id%': '', 4751 'chrome_build_id%': '',
4752 4752
4753 # Placing this variable here prevents from forking libvpx, used 4753 # Placing this variable here prevents from forking libvpx, used
4754 # by remoting. Remoting is off, so it needn't built, 4754 # by remoting. Remoting is off, so it needn't built,
4755 # so forking it's deps seems like overkill. 4755 # so forking it's deps seems like overkill.
4756 # But this variable need defined to properly run gyp. 4756 # But this variable need defined to properly run gyp.
4757 # A proper solution is to have an OS==android conditional 4757 # A proper solution is to have an OS==android conditional
4758 # in third_party/libvpx/libvpx.gyp to define it. 4758 # in third_party/libvpx_new/libvpx.gyp to define it.
4759 'libvpx_path': 'lib/linux/arm', 4759 'libvpx_path': 'lib/linux/arm',
4760 }, 4760 },
4761 'target_defaults': { 4761 'target_defaults': {
4762 'variables': { 4762 'variables': {
4763 'release_extra_cflags%': '', 4763 'release_extra_cflags%': '',
4764 'conditions': [ 4764 'conditions': [
4765 # If we're using the components build, append "cr" to all shared 4765 # If we're using the components build, append "cr" to all shared
4766 # libraries to avoid naming collisions with android system library 4766 # libraries to avoid naming collisions with android system library
4767 # versions with the same name (e.g. skia, icu). 4767 # versions with the same name (e.g. skia, icu).
4768 ['component=="shared_library"', { 4768 ['component=="shared_library"', {
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
6286 # settings in target dicts. SYMROOT is a special case, because many other 6286 # settings in target dicts. SYMROOT is a special case, because many other
6287 # Xcode variables depend on it, including variables such as 6287 # Xcode variables depend on it, including variables such as
6288 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6288 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6289 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6289 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6290 # files to appear (when present) in the UI as actual files and not red 6290 # files to appear (when present) in the UI as actual files and not red
6291 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6291 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6292 # and therefore SYMROOT, needs to be set at the project level. 6292 # and therefore SYMROOT, needs to be set at the project level.
6293 'SYMROOT': '<(DEPTH)/xcodebuild', 6293 'SYMROOT': '<(DEPTH)/xcodebuild',
6294 }, 6294 },
6295 } 6295 }
OLDNEW
« no previous file with comments | « WATCHLISTS ('k') | build/linux/unbundle/replace_gyp_files.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698