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

Side by Side Diff: build/common.gypi

Issue 10836323: Change Android build configurations (step 2). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« build/android/pylib/forwarder.py ('K') | « build/android/run_tests.py ('k') | 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 2019 matching lines...) Expand 10 before | Expand all | Expand 10 after
2030 '-g', 2030 '-g',
2031 ], 2031 ],
2032 'conditions' : [ 2032 'conditions' : [
2033 ['OS=="android"', { 2033 ['OS=="android"', {
2034 # Some configurations are copied from Release_Base to reduce 2034 # Some configurations are copied from Release_Base to reduce
2035 # the binary size. 2035 # the binary size.
2036 'variables': { 2036 'variables': {
2037 'debug_optimize%': 's', 2037 'debug_optimize%': 's',
2038 }, 2038 },
2039 'cflags': [ 2039 'cflags': [
2040 '-fno-ident',
Satish 2012/08/20 11:24:31 how is this change related to the rest of this CL?
Xianzhu 2012/08/20 17:54:58 The flag breaks clang build. I tried to use a cond
2041 '-fomit-frame-pointer', 2040 '-fomit-frame-pointer',
2042 '-fdata-sections', 2041 '-fdata-sections',
2043 '-ffunction-sections', 2042 '-ffunction-sections',
2044 ], 2043 ],
2045 'ldflags': [ 2044 'ldflags': [
2046 '-Wl,-O1', 2045 '-Wl,-O1',
2047 '-Wl,--as-needed', 2046 '-Wl,--as-needed',
2048 '-Wl,--gc-sections', 2047 '-Wl,--gc-sections',
2049 ], 2048 ],
2050 }], 2049 }],
(...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
3383 # settings in target dicts. SYMROOT is a special case, because many other 3382 # settings in target dicts. SYMROOT is a special case, because many other
3384 # Xcode variables depend on it, including variables such as 3383 # Xcode variables depend on it, including variables such as
3385 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3384 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3386 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3385 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3387 # files to appear (when present) in the UI as actual files and not red 3386 # files to appear (when present) in the UI as actual files and not red
3388 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3387 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3389 # and therefore SYMROOT, needs to be set at the project level. 3388 # and therefore SYMROOT, needs to be set at the project level.
3390 'SYMROOT': '<(DEPTH)/xcodebuild', 3389 'SYMROOT': '<(DEPTH)/xcodebuild',
3391 }, 3390 },
3392 } 3391 }
OLDNEW
« build/android/pylib/forwarder.py ('K') | « build/android/run_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698