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

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

Issue 10809015: Fix the sqlite errors of content unittests on Android (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebase Created 8 years, 5 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 | « third_party/sqlite/README.chromium ('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 { 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 23 matching lines...) Expand all
34 ], 34 ],
35 }, 35 },
36 ], 36 ],
37 ['OS=="linux" and not use_system_sqlite', { 37 ['OS=="linux" and not use_system_sqlite', {
38 'link_settings': { 38 'link_settings': {
39 'libraries': [ 39 'libraries': [
40 '-ldl', 40 '-ldl',
41 ], 41 ],
42 }, 42 },
43 }], 43 }],
44 ['OS == "android"', {
45 'defines': [
46 'SQLITE_TEMP_STORE=3',
47 ],
48 }],
44 ['os_posix == 1 and OS != "mac" and use_system_sqlite', { 49 ['os_posix == 1 and OS != "mac" and use_system_sqlite', {
45 'type': 'none', 50 'type': 'none',
46 'direct_dependent_settings': { 51 'direct_dependent_settings': {
47 'cflags': [ 52 'cflags': [
48 # This next command produces no output but it it will fail (and 53 # This next command produces no output but it it will fail (and
49 # cause GYP to fail) if we don't have a recent enough version of 54 # cause GYP to fail) if we don't have a recent enough version of
50 # sqlite. 55 # sqlite.
51 '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlit e3)', 56 '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlit e3)',
52 57
53 '<!@(pkg-config --cflags sqlite3)', 58 '<!@(pkg-config --cflags sqlite3)',
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'src/src/shell_icu_linux.c', 157 'src/src/shell_icu_linux.c',
153 ], 158 ],
154 'link_settings': { 159 'link_settings': {
155 'link_languages': ['c++'], 160 'link_languages': ['c++'],
156 }, 161 },
157 }, 162 },
158 ], 163 ],
159 },] 164 },]
160 ], 165 ],
161 } 166 }
OLDNEW
« no previous file with comments | « third_party/sqlite/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698