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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/gyp/v8.gyp

Issue 518023002: Move base library definitions from v8.gyp to base.gyp. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 4 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
« src/base/base.gyp ('K') | « src/base/base.gyp ('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 d6b59de376e7e6eb9fc92513f66076bea6941c96..c34da0bbd06d27b3f3cc87b35111a3e4472816a1 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -288,7 +288,7 @@
'target_name': 'v8_base',
'type': 'static_library',
'dependencies': [
- 'v8_libbase',
+ '../../src/base/base.gyp:base',
],
'variables': {
'optimize': 'max',
@@ -1116,262 +1116,13 @@
],
},
{
- 'target_name': 'v8_libbase',
- 'type': 'static_library',
- 'variables': {
- 'optimize': 'max',
- },
- 'include_dirs+': [
- '../..',
- ],
- 'sources': [
- '../../src/base/atomicops.h',
- '../../src/base/atomicops_internals_arm64_gcc.h',
- '../../src/base/atomicops_internals_arm_gcc.h',
- '../../src/base/atomicops_internals_atomicword_compat.h',
- '../../src/base/atomicops_internals_mac.h',
- '../../src/base/atomicops_internals_mips_gcc.h',
- '../../src/base/atomicops_internals_tsan.h',
- '../../src/base/atomicops_internals_x86_gcc.cc',
- '../../src/base/atomicops_internals_x86_gcc.h',
- '../../src/base/atomicops_internals_x86_msvc.h',
- '../../src/base/bits.h',
- '../../src/base/build_config.h',
- '../../src/base/cpu.cc',
- '../../src/base/cpu.h',
- '../../src/base/flags.h',
- '../../src/base/lazy-instance.h',
- '../../src/base/logging.cc',
- '../../src/base/logging.h',
- '../../src/base/macros.h',
- '../../src/base/once.cc',
- '../../src/base/once.h',
- '../../src/base/platform/elapsed-timer.h',
- '../../src/base/platform/time.cc',
- '../../src/base/platform/time.h',
- '../../src/base/platform/condition-variable.cc',
- '../../src/base/platform/condition-variable.h',
- '../../src/base/platform/mutex.cc',
- '../../src/base/platform/mutex.h',
- '../../src/base/platform/platform.h',
- '../../src/base/platform/semaphore.cc',
- '../../src/base/platform/semaphore.h',
- '../../src/base/safe_conversions.h',
- '../../src/base/safe_conversions_impl.h',
- '../../src/base/safe_math.h',
- '../../src/base/safe_math_impl.h',
- '../../src/base/sys-info.cc',
- '../../src/base/sys-info.h',
- '../../src/base/utils/random-number-generator.cc',
- '../../src/base/utils/random-number-generator.h',
- ],
- 'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host', 'target'],
- }, {
- 'toolsets': ['target'],
- }],
- ['OS=="linux"', {
- 'link_settings': {
- 'libraries': [
- '-lrt'
- ]
- },
- 'sources': [
- '../../src/base/platform/platform-linux.cc',
- '../../src/base/platform/platform-posix.cc'
- ],
- }
- ],
- ['OS=="android"', {
- 'sources': [
- '../../src/base/platform/platform-posix.cc'
- ],
- 'conditions': [
- ['host_os=="mac"', {
- 'target_conditions': [
- ['_toolset=="host"', {
- 'sources': [
- '../../src/base/platform/platform-macos.cc'
- ]
- }, {
- 'sources': [
- '../../src/base/platform/platform-linux.cc'
- ]
- }],
- ],
- }, {
- # 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'
- ]
- }],
- ],
- },
- ],
- ['OS=="qnx"', {
- 'link_settings': {
- 'target_conditions': [
- ['_toolset=="host" and host_os=="linux"', {
- 'libraries': [
- '-lrt'
- ],
- }],
- ['_toolset=="target"', {
- 'libraries': [
- '-lbacktrace'
- ],
- }],
- ],
- },
- 'sources': [
- '../../src/base/platform/platform-posix.cc',
- '../../src/base/qnx-math.h',
- ],
- 'target_conditions': [
- ['_toolset=="host" and host_os=="linux"', {
- 'sources': [
- '../../src/base/platform/platform-linux.cc'
- ],
- }],
- ['_toolset=="host" and host_os=="mac"', {
- 'sources': [
- '../../src/base/platform/platform-macos.cc'
- ],
- }],
- ['_toolset=="target"', {
- 'sources': [
- '../../src/base/platform/platform-qnx.cc'
- ],
- }],
- ],
- },
- ],
- ['OS=="freebsd"', {
- 'link_settings': {
- 'libraries': [
- '-L/usr/local/lib -lexecinfo',
- ]},
- 'sources': [
- '../../src/base/platform/platform-freebsd.cc',
- '../../src/base/platform/platform-posix.cc'
- ],
- }
- ],
- ['OS=="openbsd"', {
- 'link_settings': {
- 'libraries': [
- '-L/usr/local/lib -lexecinfo',
- ]},
- 'sources': [
- '../../src/base/platform/platform-openbsd.cc',
- '../../src/base/platform/platform-posix.cc'
- ],
- }
- ],
- ['OS=="netbsd"', {
- 'link_settings': {
- 'libraries': [
- '-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lexecinfo',
- ]},
- 'sources': [
- '../../src/base/platform/platform-openbsd.cc',
- '../../src/base/platform/platform-posix.cc'
- ],
- }
- ],
- ['OS=="solaris"', {
- 'link_settings': {
- 'libraries': [
- '-lnsl',
- ]},
- 'sources': [
- '../../src/base/platform/platform-solaris.cc',
- '../../src/base/platform/platform-posix.cc'
- ],
- }
- ],
- ['OS=="mac"', {
- 'sources': [
- '../../src/base/platform/platform-macos.cc',
- '../../src/base/platform/platform-posix.cc'
- ]},
- ],
- ['OS=="win"', {
- 'defines': [
- '_CRT_RAND_S' # for rand_s()
- ],
- 'variables': {
- 'gyp_generators': '<!(echo $GYP_GENERATORS)',
- },
- 'conditions': [
- ['gyp_generators=="make"', {
- 'variables': {
- 'build_env': '<!(uname -o)',
- },
- 'conditions': [
- ['build_env=="Cygwin"', {
- 'sources': [
- '../../src/base/platform/platform-cygwin.cc',
- '../../src/base/platform/platform-posix.cc'
- ],
- }, {
- 'sources': [
- '../../src/base/platform/platform-win32.cc',
- '../../src/base/win32-headers.h',
- '../../src/base/win32-math.cc',
- '../../src/base/win32-math.h'
- ],
- }],
- ],
- 'link_settings': {
- 'libraries': [ '-lwinmm', '-lws2_32' ],
- },
- }, {
- 'sources': [
- '../../src/base/platform/platform-win32.cc',
- '../../src/base/win32-headers.h',
- '../../src/base/win32-math.cc',
- '../../src/base/win32-math.h'
- ],
- 'msvs_disabled_warnings': [4351, 4355, 4800],
- 'link_settings': {
- 'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ],
- },
- }],
- ],
- }],
- ],
- },
- {
'target_name': 'v8_libplatform',
'type': 'static_library',
'variables': {
'optimize': 'max',
},
'dependencies': [
- 'v8_libbase',
+ '../../src/base/base.gyp:base',
],
'include_dirs+': [
'../..',
« src/base/base.gyp ('K') | « src/base/base.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698