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

Side by Side 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, 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 | « src/perf-jit.h ('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 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 '../../src/base/platform/platform-linux.cc', 1386 '../../src/base/platform/platform-linux.cc',
1387 '../../src/base/platform/platform-posix.cc' 1387 '../../src/base/platform/platform-posix.cc'
1388 ], 1388 ],
1389 } 1389 }
1390 ], 1390 ],
1391 ['OS=="android"', { 1391 ['OS=="android"', {
1392 'sources': [ 1392 'sources': [
1393 '../../src/base/platform/platform-posix.cc' 1393 '../../src/base/platform/platform-posix.cc'
1394 ], 1394 ],
1395 'link_settings': { 1395 'link_settings': {
1396 'libraries': [ 1396 'target_conditions': [
1397 '-ldl' 1397 ['_toolset=="host"', {
1398 # Only include libdl and librt on host builds because they
1399 # are included by default on Android target builds, and we
1400 # don't want to re-include them here since this will change
1401 # library order and break (see crbug.com/469973).
1402 'libraries': [
1403 '-ldl',
1404 '-lrt'
1405 ]
1406 }]
1398 ] 1407 ]
1399 }, 1408 },
1400 'conditions': [ 1409 'conditions': [
1401 ['host_os=="mac"', { 1410 ['host_os=="mac"', {
1402 'target_conditions': [ 1411 'target_conditions': [
1403 ['_toolset=="host"', { 1412 ['_toolset=="host"', {
1404 'sources': [ 1413 'sources': [
1405 '../../src/base/platform/platform-macos.cc' 1414 '../../src/base/platform/platform-macos.cc'
1406 ] 1415 ]
1407 }, { 1416 }, {
1408 'sources': [ 1417 'sources': [
1409 '../../src/base/platform/platform-linux.cc' 1418 '../../src/base/platform/platform-linux.cc'
1410 ] 1419 ]
1411 }], 1420 }],
1412 ], 1421 ],
1413 }, { 1422 }, {
1414 # TODO(bmeurer): What we really want here, is this:
1415 #
1416 # 'link_settings': {
1417 # 'target_conditions': [
1418 # ['_toolset=="host"', {
1419 # 'libraries': [
1420 # '-lrt'
1421 # ]
1422 # }]
1423 # ]
1424 # },
1425 #
1426 # but we can't do this right now, as the AOSP does not support
1427 # linking against the host librt, so we need to work around this
1428 # for now, using the following hack (see platform/time.cc):
1429 'target_conditions': [
1430 ['_toolset=="host"', {
1431 'defines': [
1432 'V8_LIBRT_NOT_AVAILABLE=1',
1433 ],
1434 }],
1435 ],
1436 'sources': [ 1423 'sources': [
1437 '../../src/base/platform/platform-linux.cc' 1424 '../../src/base/platform/platform-linux.cc'
1438 ] 1425 ]
1439 }], 1426 }],
1440 ], 1427 ],
1441 }, 1428 },
1442 ], 1429 ],
1443 ['OS=="qnx"', { 1430 ['OS=="qnx"', {
1444 'link_settings': { 1431 'link_settings': {
1445 'target_conditions': [ 1432 'target_conditions': [
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
1828 }], 1815 }],
1829 ['want_separate_host_toolset==1', { 1816 ['want_separate_host_toolset==1', {
1830 'toolsets': ['host'], 1817 'toolsets': ['host'],
1831 }, { 1818 }, {
1832 'toolsets': ['target'], 1819 'toolsets': ['target'],
1833 }], 1820 }],
1834 ], 1821 ],
1835 }, 1822 },
1836 ], 1823 ],
1837 } 1824 }
OLDNEW
« 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