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

Unified Diff: build/common.gypi

Issue 7051017: Remove more library=shared_library pieces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 6c8d55e870ad20c3351efeeb664434f7a26c99c2..0ad9a92b60169aafb8947a306385db65e83dec68 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -28,14 +28,6 @@
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
- # To do a shared build on linux we need to be able to choose between
- # type static_library and shared_library. We default to doing a static
- # build but you can override this with "gyp -Dlibrary=shared_library"
- # or you can add the following line (without the #) to
- # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
- # to compile as shared by default
- 'library%': 'static_library',
-
# Compute the architecture that we're building on.
'conditions': [
[ 'OS=="win" or OS=="mac"', {
@@ -62,7 +54,6 @@
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
'host_arch%': '<(host_arch)',
- 'library%': 'static_library',
'toolkit_views%': '<(toolkit_views)',
# Override branding to select the desired branding flavor.
@@ -217,7 +208,6 @@
'arm_neon%': '<(arm_neon)',
'sysroot%': '<(sysroot)',
'disable_sse2%': '<(disable_sse2)',
- 'library%': 'static_library',
'component%': '<(component)',
'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
'use_third_party_translations%': '<(use_third_party_translations)',
@@ -225,6 +215,11 @@
'p2p_apis%': '<(p2p_apis)',
'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
+ # We used to provide a variable for changing how libraries were built.
+ # This variable remains until we can clean up all the users.
+ # http://code.google.com/p/chromium/issues/detail?id=83308
+ 'library%': 'static_library',
+
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
# The default is 'all', which does no channel-specific filtering.
@@ -1340,22 +1335,6 @@
'cflags': [ '-g' ],
'defines': ['USE_LINUX_BREAKPAD'],
}],
- ['library=="shared_library"', {
- # When building with shared libraries, remove the visiblity-hiding
- # flag.
- 'cflags!': [ '-fvisibility=hidden' ],
- 'conditions': [
- ['target_arch=="x64" or target_arch=="arm"', {
- # Shared libraries need -fPIC on x86-64 and arm
- 'cflags': ['-fPIC']
- }]
- ],
- 'ldflags!': [
- # --as-needed confuses library interdependencies.
- # See http://code.google.com/p/chromium/issues/detail?id=61430
- '-Wl,--as-needed',
- ],
- }],
['linux_use_heapchecker==1', {
'variables': {'linux_use_tcmalloc%': 1},
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698