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

Unified Diff: src/v8.gyp

Issue 2393603002: Revert of Turn libbase into a component (Closed)
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/startup-data-util.cc ('k') | test/cctest/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/v8.gyp
diff --git a/src/v8.gyp b/src/v8.gyp
index d82357b8b8f9471482d96240af01ee89dfa13d90..9d538d07c79f149b37563e73879f2bb4154b21da 100644
--- a/src/v8.gyp
+++ b/src/v8.gyp
@@ -68,6 +68,16 @@
'USING_V8_SHARED',
],
},
+ 'target_conditions': [
+ ['OS=="android" and _toolset=="target"', {
+ 'libraries': [
+ '-llog',
+ ],
+ 'include_dirs': [
+ 'src/common/android/include',
+ ],
+ }],
+ ],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
@@ -1750,7 +1760,7 @@
},
{
'target_name': 'v8_libbase',
- 'type': '<(component)',
+ 'type': 'static_library',
'variables': {
'optimize': 'max',
},
@@ -1773,7 +1783,6 @@
'base/atomicops_internals_x86_gcc.cc',
'base/atomicops_internals_x86_gcc.h',
'base/atomicops_internals_x86_msvc.h',
- 'base/base-export.h',
'base/bits.cc',
'base/bits.h',
'base/build_config.h',
@@ -1821,32 +1830,12 @@
'base/utils/random-number-generator.cc',
'base/utils/random-number-generator.h',
],
- 'target_conditions': [
- ['OS=="android" and _toolset=="target"', {
- 'libraries': [
- '-llog',
- ],
- 'include_dirs': [
- 'src/common/android/include',
- ],
- }],
- ],
'conditions': [
['want_separate_host_toolset==1 or \
want_separate_host_toolset_mkpeephole==1', {
'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
- }],
- ['component=="shared_library"', {
- 'defines': [
- 'BUILDING_V8_BASE_SHARED',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'USING_V8_BASE_SHARED',
- ],
- },
}],
['OS=="linux"', {
'link_settings': {
@@ -2408,12 +2397,7 @@
{
'target_name': 'mksnapshot',
'type': 'executable',
- 'dependencies': [
- 'v8_base',
- 'v8_libbase',
- 'v8_nosnapshot',
- 'v8_libplatform'
- ],
+ 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
'include_dirs+': [
'..',
'<(DEPTH)',
« no previous file with comments | « src/startup-data-util.cc ('k') | test/cctest/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698