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

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

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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 | « third_party/libjingle/libjingle.gyp ('k') | ui/app_list/app_list.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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 'link_settings': { 124 'link_settings': {
125 'libraries': [ 125 'libraries': [
126 '-ldl', 126 '-ldl',
127 ], 127 ],
128 }, 128 },
129 }], 129 }],
130 ['OS == "mac" or OS == "ios"', { 130 ['OS == "mac" or OS == "ios"', {
131 'link_settings': { 131 'link_settings': {
132 'libraries': [ 132 'libraries': [
133 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework ', 133 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework ',
134 '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
134 ], 135 ],
135 }, 136 },
136 }], 137 }],
137 ['OS == "android"', { 138 ['OS == "android"', {
138 'defines': [ 139 'defines': [
139 'HAVE_USLEEP=1', 140 'HAVE_USLEEP=1',
140 'SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576', 141 'SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576',
141 'SQLITE_DEFAULT_AUTOVACUUM=1', 142 'SQLITE_DEFAULT_AUTOVACUUM=1',
142 'SQLITE_TEMP_STORE=3', 143 'SQLITE_TEMP_STORE=3',
143 'SQLITE_ENABLE_FTS3_BACKWARDS', 144 'SQLITE_ENABLE_FTS3_BACKWARDS',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 '../icu/icu.gyp:icuuc', 202 '../icu/icu.gyp:icuuc',
202 ], 203 ],
203 'sources': [ 204 'sources': [
204 'src/ext/icu/icu.c', 205 'src/ext/icu/icu.c',
205 ], 206 ],
206 }, 207 },
207 ], 208 ],
208 }], 209 }],
209 ], 210 ],
210 } 211 }
OLDNEW
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | ui/app_list/app_list.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698