From 321bb26b2534c3c137c21fa27fb6cc38cbd491be Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Fri, 16 Oct 2009 18:49:51 +0000 Subject: Pulling in newer gyp which fixes link after copy problem. Updating LIBRARY_PREFIX -> SHARED_LIB_PREFIX to reflect changed convention. BUG=None TEST=None Review URL: http://codereview.chromium.org/283014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29302 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/DEPS | 2 +- o3d/DEPS_gyp | 2 +- o3d/plugin/plugin.gyp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/o3d/DEPS b/o3d/DEPS index a8ea48b..d878779 100644 --- a/o3d/DEPS +++ b/o3d/DEPS @@ -5,7 +5,7 @@ vars = { "chromium_rev": "22547", "o3d_code_rev": "154", "skia_rev": "279", - "gyp_rev": "606", + "gyp_rev": "706", "gtest_rev": "267", "gflags_rev": "30", "breakpad_rev": "346", diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp index ec6258a..cae722b 100644 --- a/o3d/DEPS_gyp +++ b/o3d/DEPS_gyp @@ -4,7 +4,7 @@ vars = { "chromium_rev": "28829", "o3d_code_rev": "154", "skia_rev": "376", - "gyp_rev": "697", + "gyp_rev": "706", "gtest_rev": "329", "gflags_rev": "30", "breakpad_rev": "391", diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 0341f97..45d3fe2 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -347,7 +347,7 @@ { 'destination': '<(PRODUCT_DIR)', 'files': [ - '<(PRODUCT_DIR)/obj/o3d/plugin/<(LIBRARY_PREFIX)<(_target_name)<(SHARED_LIB_SUFFIX)', + '<(PRODUCT_DIR)/obj/o3d/plugin/<(SHARED_LIB_PREFIX)<(_target_name)<(SHARED_LIB_SUFFIX)', ], }, ], -- cgit v1.1