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

Side by Side Diff: build/android.gypi

Issue 752063002: Move C++ flags for Android to cxxflags section (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: updates Created 6 years 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 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 'ANDROID', 67 'ANDROID',
68 'V8_ANDROID_LOG_STDOUT', 68 'V8_ANDROID_LOG_STDOUT',
69 ], 69 ],
70 'configurations': { 70 'configurations': {
71 'Release': { 71 'Release': {
72 'cflags': [ 72 'cflags': [
73 '-fomit-frame-pointer', 73 '-fomit-frame-pointer',
74 ], 74 ],
75 }, # Release 75 }, # Release
76 }, # configurations 76 }, # configurations
77 'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter', 77 'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter'],
78 '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions', 78 'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions',
79 # Note: Using -std=c++0x will define __STRICT_ANSI__, which in 79 # Note: Using -std=c++0x will define __STRICT_ANSI__, which
80 # turn will leave out some template stuff for 'long long'. What 80 # in turn will leave out some template stuff for 'long
81 # we want is -std=c++11, but this is not supported by GCC 4.6 or 81 # long'. What we want is -std=c++11, but this is not
82 # Xcode 4.2 82 # supported by GCC 4.6 or Xcode 4.2
83 '-std=gnu++0x' ], 83 '-std=gnu++0x' ],
84 'target_conditions': [ 84 'target_conditions': [
85 ['_toolset=="target"', { 85 ['_toolset=="target"', {
86 'cflags!': [ 86 'cflags!': [
87 '-pthread', # Not supported by Android toolchain. 87 '-pthread', # Not supported by Android toolchain.
88 ], 88 ],
89 'cflags': [ 89 'cflags': [
90 '-ffunction-sections', 90 '-ffunction-sections',
91 '-funwind-tables', 91 '-funwind-tables',
92 '-fstack-protector', 92 '-fstack-protector',
93 '-fno-short-enums', 93 '-fno-short-enums',
94 '-finline-limit=64', 94 '-finline-limit=64',
95 '-Wa,--noexecstack', 95 '-Wa,--noexecstack',
96 '-Wno-error=non-virtual-dtor', # TODO(michaelbai): Fix warnings.
97 # Note: This include is in cflags to ensure that it comes after 96 # Note: This include is in cflags to ensure that it comes after
98 # all of the includes. 97 # all of the includes.
99 '-I<(android_include)', 98 '-I<(android_include)',
100 ], 99 ],
100 'cflags_cc': [
101 '-Wno-error=non-virtual-dtor', # TODO(michaelbai): Fix warnings.
102 ],
101 'defines': [ 103 'defines': [
102 'ANDROID', 104 'ANDROID',
103 #'__GNU_SOURCE=1', # Necessary for clone() 105 #'__GNU_SOURCE=1', # Necessary for clone()
104 'USE_STLPORT=1', 106 'USE_STLPORT=1',
105 '_STLP_USE_PTR_SPECIALIZATIONS=1', 107 '_STLP_USE_PTR_SPECIALIZATIONS=1',
106 'HAVE_OFF64_T', 108 'HAVE_OFF64_T',
107 'HAVE_SYS_UIO_H', 109 'HAVE_SYS_UIO_H',
108 'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize. 110 'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize.
109 ], 111 ],
110 'ldflags!': [ 112 'ldflags!': [
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 'ldflags!': [ 271 'ldflags!': [
270 '-Wl,-z,noexecstack', 272 '-Wl,-z,noexecstack',
271 '-Wl,--gc-sections', 273 '-Wl,--gc-sections',
272 '-Wl,-O1', 274 '-Wl,-O1',
273 '-Wl,--as-needed', 275 '-Wl,--as-needed',
274 ], 276 ],
275 }], 277 }],
276 ], # target_conditions 278 ], # target_conditions
277 }, # target_defaults 279 }, # target_defaults
278 } 280 }
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