diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 23:51:05 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 23:51:05 +0000 |
| commit | c3f04ecc2993020f3d0a97a5fb6823e68296598a (patch) | |
| tree | 241858bc856b396ea804aceb01f8a3a108c10ef7 /o3d | |
| parent | ab4707af48416b411021b27e67b67270f3caec10 (diff) | |
| download | chromium_src-c3f04ecc2993020f3d0a97a5fb6823e68296598a.zip chromium_src-c3f04ecc2993020f3d0a97a5fb6823e68296598a.tar.gz chromium_src-c3f04ecc2993020f3d0a97a5fb6823e68296598a.tar.bz2 | |
This updates us to the latest gyp revision, which fixes the Linux
build, and also removes a hack that was put in to get around Linux
Gyp's old odd behavior.
Review URL: http://codereview.chromium.org/260023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/DEPS_gyp | 2 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp index f06121e..d61540c 100644 --- a/o3d/DEPS_gyp +++ b/o3d/DEPS_gyp @@ -4,7 +4,7 @@ vars = { "chromium_rev": "27534", "o3d_code_rev": "149", "skia_rev": "341", - "gyp_rev": "671", + "gyp_rev": "682", "gtest_rev": "267", "gflags_rev": "30", "breakpad_rev": "391", diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 495e8b8..4c9da18 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -200,17 +200,6 @@ '-lGL', ], }, - # On Linux, shared library targets aren't copied to the - # product dir automatically. Filed GYP issue #74 to address this. - # TODO(gspencer): Remove when issue #74 is resolved. - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(PRODUCT_DIR)/obj/o3d/plugin/<(LIBRARY_PREFIX)<(_target_name)<(SHARED_LIB_SUFFIX)', - ], - }, - ], }, ], ['OS == "win"', |