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

Side by Side Diff: build/common.gypi

Issue 1734613003: Move libvpx_new to libvpx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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 4712 matching lines...) Expand 10 before | Expand all | Expand 10 after
4723 # This is a unique identifier for a given build. It's used for 4723 # This is a unique identifier for a given build. It's used for
4724 # identifying various build artifacts corresponding to a particular 4724 # identifying various build artifacts corresponding to a particular
4725 # build of chrome (e.g. where to find archived symbols). 4725 # build of chrome (e.g. where to find archived symbols).
4726 'chrome_build_id%': '', 4726 'chrome_build_id%': '',
4727 4727
4728 # Placing this variable here prevents from forking libvpx, used 4728 # Placing this variable here prevents from forking libvpx, used
4729 # by remoting. Remoting is off, so it needn't built, 4729 # by remoting. Remoting is off, so it needn't built,
4730 # so forking it's deps seems like overkill. 4730 # so forking it's deps seems like overkill.
4731 # But this variable need defined to properly run gyp. 4731 # But this variable need defined to properly run gyp.
4732 # A proper solution is to have an OS==android conditional 4732 # A proper solution is to have an OS==android conditional
4733 # in third_party/libvpx_new/libvpx.gyp to define it. 4733 # in third_party/libvpx/libvpx.gyp to define it.
4734 'libvpx_path': 'lib/linux/arm', 4734 'libvpx_path': 'lib/linux/arm',
4735 }, 4735 },
4736 'target_defaults': { 4736 'target_defaults': {
4737 'variables': { 4737 'variables': {
4738 'release_extra_cflags%': '', 4738 'release_extra_cflags%': '',
4739 'conditions': [ 4739 'conditions': [
4740 # If we're using the components build, append "cr" to all shared 4740 # If we're using the components build, append "cr" to all shared
4741 # libraries to avoid naming collisions with android system library 4741 # libraries to avoid naming collisions with android system library
4742 # versions with the same name (e.g. skia, icu). 4742 # versions with the same name (e.g. skia, icu).
4743 ['component=="shared_library"', { 4743 ['component=="shared_library"', {
(...skipping 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
6353 # settings in target dicts. SYMROOT is a special case, because many other 6353 # settings in target dicts. SYMROOT is a special case, because many other
6354 # Xcode variables depend on it, including variables such as 6354 # Xcode variables depend on it, including variables such as
6355 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6355 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6356 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6356 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6357 # files to appear (when present) in the UI as actual files and not red 6357 # files to appear (when present) in the UI as actual files and not red
6358 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6358 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6359 # and therefore SYMROOT, needs to be set at the project level. 6359 # and therefore SYMROOT, needs to be set at the project level.
6360 'SYMROOT': '<(DEPTH)/xcodebuild', 6360 'SYMROOT': '<(DEPTH)/xcodebuild',
6361 }, 6361 },
6362 } 6362 }
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