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

Side by Side Diff: trunk/src/build/common.gypi

Issue 217233005: Revert 260917 "Media Galleries API Metadata: Image metadata" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc » ('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 2225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2236 ['OS=="linux" and clang==1 and host_arch=="ia32"', { 2236 ['OS=="linux" and clang==1 and host_arch=="ia32"', {
2237 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed. 2237 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed.
2238 # See http://crbug.com/162818. 2238 # See http://crbug.com/162818.
2239 'cflags+': ['-Wno-sentinel'], 2239 'cflags+': ['-Wno-sentinel'],
2240 }], 2240 }],
2241 ['branding=="Chrome"', { 2241 ['branding=="Chrome"', {
2242 'defines': ['GOOGLE_CHROME_BUILD'], 2242 'defines': ['GOOGLE_CHROME_BUILD'],
2243 }, { # else: branding!="Chrome" 2243 }, { # else: branding!="Chrome"
2244 'defines': ['CHROMIUM_BUILD'], 2244 'defines': ['CHROMIUM_BUILD'],
2245 }], 2245 }],
2246 ['OS=="mac"', {
2247 'xcode_settings': {
2248 'LD_RUNPATH_SEARCH_PATHS': [
2249 # To find dylibs such as libexif.
2250 '@loader_path/.',
2251 ],
2252 },
2253 }],
2254 ['OS=="mac" and component=="shared_library"', { 2246 ['OS=="mac" and component=="shared_library"', {
2255 'xcode_settings': { 2247 'xcode_settings': {
2256 'DYLIB_INSTALL_NAME_BASE': '@rpath', 2248 'DYLIB_INSTALL_NAME_BASE': '@rpath',
2257 'LD_RUNPATH_SEARCH_PATHS': [ 2249 'LD_RUNPATH_SEARCH_PATHS': [
2258 # For unbundled binaries. 2250 # For unbundled binaries.
2259 '@loader_path/.', 2251 '@loader_path/.',
2260 # For bundled binaries, to get back from Binary.app/Contents/MacOS. 2252 # For bundled binaries, to get back from Binary.app/Contents/MacOS.
2261 '@loader_path/../../..', 2253 '@loader_path/../../..',
2262 ], 2254 ],
2263 }, 2255 },
(...skipping 2944 matching lines...) Expand 10 before | Expand all | Expand 10 after
5208 # settings in target dicts. SYMROOT is a special case, because many other 5200 # settings in target dicts. SYMROOT is a special case, because many other
5209 # Xcode variables depend on it, including variables such as 5201 # Xcode variables depend on it, including variables such as
5210 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5202 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5211 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5203 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5212 # files to appear (when present) in the UI as actual files and not red 5204 # files to appear (when present) in the UI as actual files and not red
5213 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5205 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5214 # and therefore SYMROOT, needs to be set at the project level. 5206 # and therefore SYMROOT, needs to be set at the project level.
5215 'SYMROOT': '<(DEPTH)/xcodebuild', 5207 'SYMROOT': '<(DEPTH)/xcodebuild',
5216 }, 5208 },
5217 } 5209 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698