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

Unified Diff: content/content_browser.gypi

Issue 11571036: Linux: use generated library loader for libgps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixlets Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/geolocation/libgps_wrapper_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 368ba6814f58b8b7e55e2552ff53aa7798ca3eea..34e6bf141133f606bd9f9f9b431ecfe2b76bb4ef 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -3,17 +3,6 @@
# found in the LICENSE file.
{
- 'variables': {
- 'conditions': [
- ['chromeos==1', {
- 'use_libgps%': 1,
- }, { # chromeos==0
- # Do not use libgps on desktop Linux by default,
- # see http://crbug.com/103751.
- 'use_libgps%': 0,
- }],
- ],
- },
'dependencies': [
'browser/speech/proto/speech_proto.gyp:speech_proto',
'../base/base.gyp:base_static',
@@ -1163,19 +1152,10 @@
['exclude', '^browser/speech/'],
],
}],
- ['use_libgps==1', {
- 'defines': [
- 'USE_LIBGPS',
+ ['linux_use_libgps==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:libgps',
],
- # Because of component build, this .gypi file may be included either
- # in content_browser target, or content target. To be sure
- # the USE_LIBGPS setting propagates to the "real" dependent target,
- # we use all_dependent_settings here.
- 'all_dependent_settings': {
- 'defines': [
- 'USE_LIBGPS',
- ],
- },
}],
],
}
« no previous file with comments | « content/browser/geolocation/libgps_wrapper_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698