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

Unified Diff: tools/gyp/v8.gyp

Issue 1036133005: Fix libdl dependency on Android and remove librt hack. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/perf-jit.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index effec7b357613d658d37a0aa6c5b81bcea11ed65..5f372481a5167b44e47b69089d77193a8e56364a 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -1393,8 +1393,17 @@
'../../src/base/platform/platform-posix.cc'
],
'link_settings': {
- 'libraries': [
- '-ldl'
+ 'target_conditions': [
+ ['_toolset=="host"', {
+ # Only include libdl and librt on host builds because they
+ # are included by default on Android target builds, and we
+ # don't want to re-include them here since this will change
+ # library order and break (see crbug.com/469973).
+ 'libraries': [
+ '-ldl',
+ '-lrt'
+ ]
+ }]
]
},
'conditions': [
@@ -1411,28 +1420,6 @@
}],
],
}, {
- # TODO(bmeurer): What we really want here, is this:
- #
- # 'link_settings': {
- # 'target_conditions': [
- # ['_toolset=="host"', {
- # 'libraries': [
- # '-lrt'
- # ]
- # }]
- # ]
- # },
- #
- # but we can't do this right now, as the AOSP does not support
- # linking against the host librt, so we need to work around this
- # for now, using the following hack (see platform/time.cc):
- 'target_conditions': [
- ['_toolset=="host"', {
- 'defines': [
- 'V8_LIBRT_NOT_AVAILABLE=1',
- ],
- }],
- ],
'sources': [
'../../src/base/platform/platform-linux.cc'
]
« no previous file with comments | « src/perf-jit.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698