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

Side by Side Diff: third_party/sqlite/sqlite.gyp

Issue 1048863002: Remove android_webview_build conditions from various places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « skia/skia_common.gypi ('k') | tools/imagediff/image_diff.gyp » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'use_system_sqlite%': 0, 7 'use_system_sqlite%': 0,
8 'required_sqlite_version': '3.6.1', 8 'required_sqlite_version': '3.6.1',
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 }], 157 }],
158 ['os_posix == 1 and OS != "mac" and OS != "android"', { 158 ['os_posix == 1 and OS != "mac" and OS != "android"', {
159 'cflags': [ 159 'cflags': [
160 # SQLite doesn't believe in compiler warnings, 160 # SQLite doesn't believe in compiler warnings,
161 # preferring testing. 161 # preferring testing.
162 # http://www.sqlite.org/faq.html#q17 162 # http://www.sqlite.org/faq.html#q17
163 '-Wno-int-to-pointer-cast', 163 '-Wno-int-to-pointer-cast',
164 '-Wno-pointer-to-int-cast', 164 '-Wno-pointer-to-int-cast',
165 ], 165 ],
166 }], 166 }],
167 # Enable feedback-directed optimisation for sqlite when building in android.
168 ['android_webview_build == 1', {
169 'aosp_build_settings': {
170 'LOCAL_FDO_SUPPORT': 'true',
171 },
172 }],
173 ], 167 ],
174 }], 168 }],
175 ], 169 ],
176 'includes': [ 170 'includes': [
177 # Disable LTO due to ELF section name out of range 171 # Disable LTO due to ELF section name out of range
178 # crbug.com/422251 172 # crbug.com/422251
179 '../../build/android/disable_lto.gypi', 173 '../../build/android/disable_lto.gypi',
180 ], 174 ],
181 }, 175 },
182 ], 176 ],
(...skipping 26 matching lines...) Expand all
209 '../icu/icu.gyp:icuuc', 203 '../icu/icu.gyp:icuuc',
210 ], 204 ],
211 'sources': [ 205 'sources': [
212 'src/ext/icu/icu.c', 206 'src/ext/icu/icu.c',
213 ], 207 ],
214 }, 208 },
215 ], 209 ],
216 }], 210 }],
217 ], 211 ],
218 } 212 }
OLDNEW
« no previous file with comments | « skia/skia_common.gypi ('k') | tools/imagediff/image_diff.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698