Skip to content

Commit

Permalink
Get rid of all component builds specific .isolate.
Browse files Browse the repository at this point in the history
The status quo was unmaintainable.  These 'component build specific .isolate
files' are superseeded by tools/isolate_driver.py which packages dynamic
libraries automatically.

The new way is much more sane and dynamic, isolate_driver.py is currently very
crude but 'does the job', the expected way to make it work is to read the .ninja
files to extract all the dynamic libraries marked as a dependency to the main
target being executed.

TBR=csharp@chromium.org
BUG=333473

Review URL: https://codereview.chromium.org/226123004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261871 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
maruel@chromium.org committed Apr 4, 2014
1 parent 73a7a8a commit 4df54e8
Show file tree
Hide file tree
Showing 15 changed files with 2 additions and 357 deletions.
43 changes: 0 additions & 43 deletions base/base.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'conditions': [
['OS=="linux" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib/libbase.so',
'<(PRODUCT_DIR)/lib/libbase_i18n.so',
],
},
}],
['OS=="mac" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/libbase.dylib',
'<(PRODUCT_DIR)/libbase_i18n.dylib',
],
},
}],
['OS=="win" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/base.dll',
'<(PRODUCT_DIR)/base_i18n.dll',
],
},
}],
],
# Important note:
# Running:
# 1. GYP_DEFINES=component=shared_library build/gyp_chromium
# 2. ninja -C out/Debug base
# will result with only libbase.so being built. Building base by itself won't
# force the build of icu or nss. This is because base is not usable by itself.
# But on the other hand any test that includes base will be building and
# loading at runtime both icu and nss. So define here what is brought by
# importing base, not what base would load at runtime.
#
# There is no such thing as direct_dependent in .isolate, so it's not the best
# format to describe this kind of thing. But as a user of base.so, the user
# will be importing these other libraries:
'includes': [
# While the target 'base' doesn't depend on ../build/linux/system.gyp:ssl
# itself, virtually all targets using it has to include
# ../third_party/nss/ssl.gyp:libssl through system.gyp.
'../build/linux/system.isolate',
# While the target 'base' doesn't depend on ../third_party/icu/icu.gyp
# itself, virtually all targets using it has to include icu. The only
# exception is the Windows sandbox (?).
Expand Down
28 changes: 0 additions & 28 deletions base/base_prefs.isolate

This file was deleted.

1 change: 0 additions & 1 deletion base/base_unittests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,5 @@
],
'includes': [
'base.isolate',
'base_prefs.isolate',
],
}
12 changes: 0 additions & 12 deletions build/linux/system.isolate

This file was deleted.

2 changes: 1 addition & 1 deletion chrome/unit_tests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@
}],
],
'includes': [
'../third_party/icu/icu.isolate',
'../base/base.isolate',
],
}
28 changes: 0 additions & 28 deletions crypto/crypto.isolate

This file was deleted.

42 changes: 0 additions & 42 deletions mojo/mojo_apps_js_unittests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,13 @@
],
},
}],
['OS=="win" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/base.dll',
'<(PRODUCT_DIR)/base_i18n.dll',
'<(PRODUCT_DIR)/gin.dll',
'<(PRODUCT_DIR)/mojo_system_impl.dll',
'<(PRODUCT_DIR)/msvcp120d.dll',
'<(PRODUCT_DIR)/msvcr120d.dll',
'<(PRODUCT_DIR)/v8.dll',
],
},
}],
['OS=="linux"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib/libmojo_test_support.so',
],
},
}],
['OS=="linux" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib/libbase.so',
'<(PRODUCT_DIR)/lib/libbase_i18n.so',
'<(PRODUCT_DIR)/lib/libgin.so',
'<(PRODUCT_DIR)/lib/libmojo_system_impl.so',
'<(PRODUCT_DIR)/lib/libv8.so',
],
},
}],
['OS=="mac"', {
'variables': {
'isolate_dependency_tracked': [
Expand All @@ -74,23 +50,5 @@
],
},
}],
['OS=="mac" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/libbase.dylib',
'<(PRODUCT_DIR)/libbase_i18n.dylib',
'<(PRODUCT_DIR)/libgfx.dylib',
'<(PRODUCT_DIR)/libgfx_geometry.dylib',
'<(PRODUCT_DIR)/libgin.dylib',
'<(PRODUCT_DIR)/libgl_wrapper.dylib',
'<(PRODUCT_DIR)/libgles2_utils.dylib',
'<(PRODUCT_DIR)/libmojo_common_lib.dylib',
'<(PRODUCT_DIR)/libmojo_environment_chromium_impl.dylib',
'<(PRODUCT_DIR)/libmojo_system_impl.dylib',
'<(PRODUCT_DIR)/libskia.dylib',
'<(PRODUCT_DIR)/libv8.dylib',
],
},
}],
],
}
36 changes: 0 additions & 36 deletions mojo/mojo_js_unittests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -34,55 +34,19 @@
],
},
}],
['OS=="win" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/base.dll',
'<(PRODUCT_DIR)/base_i18n.dll',
'<(PRODUCT_DIR)/gin.dll',
'<(PRODUCT_DIR)/mojo_system_impl.dll',
'<(PRODUCT_DIR)/msvcp120d.dll',
'<(PRODUCT_DIR)/msvcr120d.dll',
'<(PRODUCT_DIR)/v8.dll',
],
},
}],
['OS=="linux"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib/libmojo_test_support.so',
],
},
}],
['OS=="linux" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib/libbase.so',
'<(PRODUCT_DIR)/lib/libbase_i18n.so',
'<(PRODUCT_DIR)/lib/libgin.so',
'<(PRODUCT_DIR)/lib/libmojo_system_impl.so',
'<(PRODUCT_DIR)/lib/libv8.so',
],
},
}],
['OS=="mac"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/libmojo_test_support.dylib',
],
},
}],
['OS=="mac" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/libbase.dylib',
'<(PRODUCT_DIR)/libbase_i18n.dylib',
'<(PRODUCT_DIR)/libgin.dylib',
'<(PRODUCT_DIR)/libmojo_common_lib.dylib',
'<(PRODUCT_DIR)/libmojo_system_impl.dylib',
'<(PRODUCT_DIR)/libv8.dylib',
],
},
}],
],
}
29 changes: 0 additions & 29 deletions net/net.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,8 @@
# found in the LICENSE file.
{
'conditions': [
['OS=="linux" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib/libnet.so',
'<(PRODUCT_DIR)/lib/libnet_with_v8.so',
],
},
}],
['OS=="mac" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/libnet.dylib',
'<(PRODUCT_DIR)/libnet_with_v8.dylib',
],
},
}],
['OS=="win" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/net.dll',
'<(PRODUCT_DIR)/net_with_v8.dll',
],
},
}],
],
'includes': [
'../base/base.isolate',
'../crypto/crypto.isolate',
'../third_party/nss.isolate',
'../url/url.isolate',
'third_party/nss/ssl.isolate',
'v8.isolate',
],
}
9 changes: 1 addition & 8 deletions net/net_unittests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,8 @@
'read_only': 1,
},
}],
['OS=="linux" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib/libopenssl.so',
],
},
}],
],
'includes': [
'net.isolate',
'../base/base.isolate',
],
}
24 changes: 0 additions & 24 deletions net/third_party/nss/ssl.isolate

This file was deleted.

16 changes: 0 additions & 16 deletions net/third_party/nss/ssl_base.isolate

This file was deleted.

30 changes: 0 additions & 30 deletions net/v8.isolate

This file was deleted.

Loading

0 comments on commit 4df54e8

Please sign in to comment.