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

Unified Diff: chrome/nacl.gypi

Issue 7051014: Globally replace <(library) with static_library (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 | « chrome/installer/mac/third_party/xz/xz.gyp ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl.gypi
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 84da264cc716dbfb452adb722e77878853d27ab4..031147dad3e76efb15d28df0790e5a04cb363ca2 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -53,9 +53,6 @@
'targets': [
{
'target_name': 'nacl',
- # The TLS (Thread Local Storage) access used by NaCl on x86-64
- # on Linux/ELF can't be linked into a shared library, so we
- # can't use '<(library)' here. See http://crbug.com/35829.
'type': 'static_library',
'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C',
'variables': {
@@ -97,7 +94,7 @@
'targets': [
{
'target_name': 'nacl_win64',
- 'type': '<(library)',
+ 'type': 'static_library',
'msvs_guid': '14135464-9FB9-42E3-99D8-791116FA1204',
'variables': {
'nacl_target': 1,
« no previous file with comments | « chrome/installer/mac/third_party/xz/xz.gyp ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698