This updates the DEPS to bring them in line with the versions

that Chrome is currently using, and it removes "files" from the NPAPI
include paths and file location in third_party so that we can be consistent
with other Chrome third party directories.

TEST=build using gyp and scons and ran unit tests on each.
Review URL: http://codereview.chromium.org/159277

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21415 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 146 insertions, 51 deletions

diff --git a/o3d/DEPS b/o3d/DEPS
index 04f0d55..921a2ae 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -3,6 +3,12 @@ vars = {
     "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "28",
   "o3d_code_rev": "101",
+  "skia_rev": "279",
+  "gyp_rev": "553",
+  "gtest_rev": "267",
+  "gflags_rev": "30",
+  "breakpad_rev": "346",
+  "v8_rev": "2507",
 }
 
 deps = {
@@ -67,30 +73,30 @@ deps = {
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zlib@" + Var("o3d_code_rev"),
 
   "o3d/third_party/v8":
-    "http://v8.googlecode.com/svn/trunk@2255",
+    "http://v8.googlecode.com/svn/branches/1.2@" + Var("v8_rev"),
 
   # NACL has to be in this weird directory because it looks for
   # googleclient two levels above it.
   "o3d/third_party/native_client/googleclient/native_client":
     "http://nativeclient.googlecode.com/svn/trunk/nacl/googleclient/native_client@188",
 
-  "o3d/third_party/breakpad/files":
-    "http://google-breakpad.googlecode.com/svn/trunk@339",
+  "o3d/third_party/breakpad":
+    "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
 
-  "o3d/third_party/nixysa/files":
+  "o3d/third_party/nixysa":
     "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"),
 
-  "o3d/third_party/npapi/files":
+  "o3d/third_party/npapi":
     "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_rev"),
 
-  "o3d/third_party/ply/files":
+  "o3d/third_party/ply":
     "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_rev"),
 
   "o3d/third_party/gflags/":
-    "http://google-gflags.googlecode.com/svn/trunk@30",
+    "http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"),
 
   "o3d/third_party/gtest/files":
-    "http://googletest.googlecode.com/svn/trunk@243",
+    "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
 
   "o3d/third_party/gmock/files":
     "http://googlemock.googlecode.com/svn/tags/release-1.0.0",
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 2ea2108..3518adb 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -2,8 +2,15 @@ vars = {
   "chromium_trunk":
     "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "28",
-  "chromium_rev": "19644",
+  "chromium_rev": "21287",
   "o3d_code_rev": "101",
+  "skia_rev": "279",
+  "gyp_rev": "553",
+  "gtest_rev": "267",
+  "gflags_rev": "30",
+  "breakpad_rev": "346",
+  "icu38_rev": "20192",
+  "v8_rev": "2507",
 }
 
 deps = {
@@ -52,7 +59,7 @@ deps = {
 # Stuff from the Chromium tree.
 
   "third_party/skia":
-    "http://skia.googlecode.com/svn/trunk@239",
+    "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"),
 
   "third_party/libevent":
     Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
@@ -61,7 +68,7 @@ deps = {
     Var("chromium_trunk") + "/src/third_party/boost@" + Var("chromium_rev"),
 
   "third_party/icu38":
-    Var("chromium_trunk") + "/deps/third_party/icu38@16445",
+    Var("chromium_trunk") + "/deps/third_party/icu38@" + Var("icu38_rev"),
 
   "third_party/libjpeg":
     Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_rev"),
@@ -73,7 +80,7 @@ deps = {
     Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"),
 
   "v8":
-    "http://v8.googlecode.com/svn/trunk@2291",
+    "http://v8.googlecode.com/svn/branches/1.2@" + Var("v8_rev"),
 
   "testing":
     Var("chromium_trunk") + "/src/testing@" + Var("chromium_rev"),
@@ -93,22 +100,22 @@ deps = {
     "http://nativeclient.googlecode.com/svn/trunk/nacl/googleclient/native_client@188",
 
   "breakpad/src":
-    "http://google-breakpad.googlecode.com/svn/trunk/src@346",
+    "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
 
-  "third_party/nixysa/files":
+  "third_party/nixysa":
     "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"),
 
-  "third_party/npapi/files":
+  "third_party/npapi":
     "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_rev"),
 
-  "third_party/ply/files":
+  "third_party/ply":
     "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_rev"),
 
-  "third_party/gflags/":
-    "http://google-gflags.googlecode.com/svn/trunk@30",
+  "third_party/gflags":
+    "http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"),
 
   "testing/gtest":
-    "http://googletest.googlecode.com/svn/trunk@267",
+    "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
 
   "testing/gmock":
     Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"),
@@ -119,7 +126,7 @@ deps = {
     Var("chromium_trunk") + "/src/build@" + Var("chromium_rev"),
 
   "tools/gyp":
-    "http://gyp.googlecode.com/svn/trunk@532",
+    "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"),
 }
 
 deps_os = {
@@ -136,6 +143,6 @@ hooks = [
   {
     # A change to a .gyp, .gypi, or to GYP itself shound run the generator.
     "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]",
-    "action": ["python", "tools/gyp/gyp_dogfood", "o3d/build/all.gyp", "--depth", ".."],
+    "action": ["python", "tools/gyp/gyp", "o3d/build/all.gyp", "--depth", ".."],
   },
 ]
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp
index dfb41e1..8705962 100644
--- a/o3d/build/all.gyp
+++ b/o3d/build/all.gyp
@@ -17,7 +17,7 @@
         '../../<(jpegdir)/libjpeg.gyp:*',
         '../../<(pngdir)/libpng.gyp:*',
         '../../<(zlibdir)/zlib.gyp:*',
-        '../compiler/technique/technique.gyp:technique',
+        '../compiler/technique/technique.gyp:o3dTechnique',
         '../converter/converter.gyp:o3dConverter',
         '../core/core.gyp:o3dCore',
         '../core/core.gyp:o3dCorePlatform',
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 0d0f714..c386319 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -14,8 +14,8 @@
     'gtestdir': 'testing/gtest/include',
     'jpegdir': 'third_party/libjpeg',
     'nacldir': 'third_party/native_client/googleclient',
-    'nixysadir': 'third_party/nixysa/files',
-    'npapidir': 'third_party/npapi/files',
+    'nixysadir': 'third_party/nixysa',
+    'npapidir': 'third_party/npapi',
     'pngdir': 'third_party/libpng',
     'skiadir': 'third_party/skia/include',
     'zlibdir': 'third_party/zlib',
diff --git a/o3d/compiler/technique/technique.gyp b/o3d/compiler/technique/technique.gyp
index 1e700b8..a750038 100644
--- a/o3d/compiler/technique/technique.gyp
+++ b/o3d/compiler/technique/technique.gyp
@@ -12,7 +12,7 @@
   ],
   'targets': [
     {
-      'target_name': 'technique',
+      'target_name': 'o3dTechnique',
       'type': 'static_library',
       'dependencies': [
         '../../../<(antlrdir)/antlr.gyp:antlr3c',
@@ -69,5 +69,23 @@
         'OTHER_CFLAGS': ['-x', 'c++'],
       },
     },
+    {
+      'target_name': 'o3dTechniqueTest',
+      'type': 'none',
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/unittest_data',
+          'files': [
+            'test_data/fur.fx',
+            'test_data/lambert.fx',
+            'test_data/noshader.fx',
+            'test_data/notechnique.fx',
+            'test_data/sampler_test.fx',
+            'test_data/shadow_map.fx',
+            'test_data/simple.fx',
+          ],
+        },
+      ],
+    },
   ],
 }
diff --git a/o3d/converter/converter.gyp b/o3d/converter/converter.gyp
index 3849b6c..a671f29 100644
--- a/o3d/converter/converter.gyp
+++ b/o3d/converter/converter.gyp
@@ -28,7 +28,7 @@
         '../../<(zlibdir)/zlib.gyp:zlib',
         '../../base/base.gyp:base',
         '../../skia/skia.gyp:skia',
-        '../compiler/technique/technique.gyp:technique',
+        '../compiler/technique/technique.gyp:o3dTechnique',
         '../core/core.gyp:o3dCore',
         '../core/core.gyp:o3dCorePlatform',
         '../import/archive.gyp:o3dArchive',
diff --git a/o3d/import/archive.gyp b/o3d/import/archive.gyp
index 8214cfc..73e12fb 100644
--- a/o3d/import/archive.gyp
+++ b/o3d/import/archive.gyp
@@ -63,6 +63,21 @@
           'cross/targz_processor_test.cc',
         ],
       },
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/archive_files',
+          'files': [
+            "../tests/archive_files/BumpReflect.fx",
+            "../tests/archive_files/bogus.tar.gz",
+            "../tests/archive_files/keyboard.jpg",
+            "../tests/archive_files/keyboard.jpg.gz",
+            "../tests/archive_files/perc.aif",
+            "../tests/archive_files/test1.tar",
+            "../tests/archive_files/test1.tar.gz",
+            "../tests/archive_files/test2.tar.gz",
+          ],
+        },
+      ],
     },
   ],
 }
diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp
index 2195700..6b716b2 100644
--- a/o3d/import/import.gyp
+++ b/o3d/import/import.gyp
@@ -28,7 +28,7 @@
         '../../<(jpegdir)/libjpeg.gyp:libjpeg',
         '../../<(pngdir)/libpng.gyp:libpng',
         '../../<(zlibdir)/zlib.gyp:zlib',
-        '../compiler/technique/technique.gyp:technique',
+        '../compiler/technique/technique.gyp:o3dTechnique',
       ],
       'sources': [
         'cross/collada_conditioner.cc',
@@ -94,6 +94,17 @@
           'cross/targz_generator_test.cc',
         ],
       },
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/unittest_data',
+          'files': [
+            'test_data/crate.dae',
+            'test_data/crate.jpg',
+            'test_data/rock01.tga',
+            'test_data/rock02.tga',
+          ],
+        },
+      ],
     },
   ],
 }
diff --git a/o3d/plugin/cross/config_common.cc b/o3d/plugin/cross/config_common.cc
index 180443c..7ed7965a 100644
--- a/o3d/plugin/cross/config_common.cc
+++ b/o3d/plugin/cross/config_common.cc
@@ -48,7 +48,7 @@
 #include "plugin/cross/config.h"
 #include "plugin/cross/o3d_glue.h"
 #include "core/cross/error.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
 
 using glue::_o3d::GetServiceLocator;
 
diff --git a/o3d/plugin/cross/main.h b/o3d/plugin/cross/main.h
index c5de7b6..29e386a 100644
--- a/o3d/plugin/cross/main.h
+++ b/o3d/plugin/cross/main.h
@@ -52,8 +52,8 @@
 #include "plugin/cross/o3d_glue.h"
 #include "plugin/cross/config.h"
 #include "plugin/cross/stream_manager.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
-#include "third_party/nixysa/files/static_glue/npapi/npn_api.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/npn_api.h"
 
 #if defined(O3D_INTERNAL_PLUGIN)
 #define HANDLE_CRASHES void(0)
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc
index 65912ba..47331ff 100644
--- a/o3d/plugin/cross/o3d_glue.cc
+++ b/o3d/plugin/cross/o3d_glue.cc
@@ -45,7 +45,7 @@
 #include "plugin/cross/stream_manager.h"
 #include "client_glue.h"
 #include "globals_glue.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
 
 #ifdef OS_MACOSX
 #include "plugin_mac.h"
@@ -850,9 +850,9 @@ void PluginObject::AsyncTick() {
   // message handler.
   // If NPN_PluginThreadAsyncCall worked in more browsers, it would be simpler
   // to use that.
-  // We're calling LoadURL here with a URL that will return 0 bytes on browsers

-  // that support the "data:" protocol and fail in browsers that don't like IE.

-  // On browsers that support it, the side effect is to call the TickCallback.

+  // We're calling LoadURL here with a URL that will return 0 bytes on browsers
+  // that support the "data:" protocol and fail in browsers that don't like IE.
+  // On browsers that support it, the side effect is to call the TickCallback.
   if (!stream_manager_->LoadURL("data:,", NULL, NULL, NULL,
                                 new TickCallback(this), NP_NORMAL)) {
     // Fallback on synchronous call if asynchronous load fails.
diff --git a/o3d/plugin/cross/o3d_glue.h b/o3d/plugin/cross/o3d_glue.h
index e67d8e6..c61d1d9 100644
--- a/o3d/plugin/cross/o3d_glue.h
+++ b/o3d/plugin/cross/o3d_glue.h
@@ -66,7 +66,7 @@
 #include "core/cross/profiler.h"
 #include "plugin/cross/np_v8_bridge.h"
 #include "client_glue.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
 
 namespace o3d {
 class Client;
diff --git a/o3d/plugin/cross/stream_manager.cc b/o3d/plugin/cross/stream_manager.cc
index 07f25a2..48da1c1 100644
--- a/o3d/plugin/cross/stream_manager.cc
+++ b/o3d/plugin/cross/stream_manager.cc
@@ -37,7 +37,7 @@
 
 #include "base/logging.h"
 #include "plugin/cross/o3d_glue.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
 
 namespace glue {
 
diff --git a/o3d/plugin/idl/codegen.py b/o3d/plugin/idl/codegen.py
index 8f029bf..329c797 100644
--- a/o3d/plugin/idl/codegen.py
+++ b/o3d/plugin/idl/codegen.py
@@ -23,7 +23,7 @@ import os.path
 
 third_party = os.path.join('..', '..', '..', 'third_party')
 pythonpath = os.pathsep.join([os.path.join(third_party, 'gflags', 'python'),
-                              os.path.join(third_party, 'ply', 'files')])
+                              os.path.join(third_party, 'ply')])
 
 orig_pythonpath = os.environ.get('PYTHONPATH')
 if orig_pythonpath:
@@ -31,6 +31,6 @@ if orig_pythonpath:
 
 os.environ['PYTHONPATH'] = pythonpath
 
-nixysa = os.path.join(third_party, 'nixysa', 'files', 'codegen.py')
+nixysa = os.path.join(third_party, 'nixysa', 'codegen.py')
 status = subprocess.call([sys.executable, nixysa] + sys.argv[1:])
 sys.exit(status)
diff --git a/o3d/plugin/idl/idl.gyp b/o3d/plugin/idl/idl.gyp
index 9f3a277..5a7b22c 100644
--- a/o3d/plugin/idl/idl.gyp
+++ b/o3d/plugin/idl/idl.gyp
@@ -9,7 +9,7 @@
   'variables': {
     'chromium_code': 0,
     'idl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/idl_glue',
-    'static_glue_dir': '../../../third_party/nixysa/files/static_glue/npapi',
+    'static_glue_dir': '../../../third_party/nixysa/static_glue/npapi',
     'idl_files': [
       'archive_request.idl',
       'bitmap.idl',
diff --git a/o3d/plugin/npapi_host_control/build.scons b/o3d/plugin/npapi_host_control/build.scons
index a53383f..5852d58 100644
--- a/o3d/plugin/npapi_host_control/build.scons
+++ b/o3d/plugin/npapi_host_control/build.scons
@@ -43,6 +43,7 @@ env.Append(
   CPPPATH = [
     'win',
     '$SCONSTRUCT_DIR/plugin/npapi_host_control/win',
+    '$NPAPI_DIR',
   ],
   LIBS = [
     'wininet',
diff --git a/o3d/plugin/npapi_host_control/win/dispatch_proxy.h b/o3d/plugin/npapi_host_control/win/dispatch_proxy.h
index bb12cc8..64209ec 100644
--- a/o3d/plugin/npapi_host_control/win/dispatch_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/dispatch_proxy.h
@@ -39,7 +39,7 @@
 #include <atlctl.h>
 #include <dispex.h>
 
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
 #include "plugin/npapi_host_control/win/np_browser_proxy.h"
 
 class NPBrowserProxy;
diff --git a/o3d/plugin/npapi_host_control/win/np_browser_proxy.h b/o3d/plugin/npapi_host_control/win/np_browser_proxy.h
index 19f3245..e245c84 100644
--- a/o3d/plugin/npapi_host_control/win/np_browser_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/np_browser_proxy.h
@@ -47,7 +47,7 @@
 
 #include <dispex.h>
 #include <map>
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
 #include "plugin/npapi_host_control/win/dispatch_proxy.h"
 #include "plugin/npapi_host_control/win/np_object_proxy.h"
 
diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc
index da7f018..e75b421 100644
--- a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc
+++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc
@@ -38,7 +38,7 @@
 #include "plugin/npapi_host_control/win/np_object_proxy.h"
 #include "plugin/npapi_host_control/win/np_browser_proxy.h"
 #include "plugin/npapi_host_control/win/variant_utils.h"
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
 
 namespace {
 
diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.h b/o3d/plugin/npapi_host_control/win/np_object_proxy.h
index 4d80676..4cf20c8 100644
--- a/o3d/plugin/npapi_host_control/win/np_object_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.h
@@ -44,7 +44,7 @@
 // type-lib.
 #include "npapi_host_control.h"
 
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
 
 struct NPObject;
 class NPBrowserProxy;
diff --git a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h
index 0c81367..6f122d1 100644
--- a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h
@@ -37,7 +37,7 @@
 #define O3D_PLUGIN_NPAPI_HOST_CONTROL_WIN_NP_PLUGIN_PROXY_H_
 
 #include <vector>
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
 
 class NPBrowserProxy;
 struct INPObjectProxy;
diff --git a/o3d/plugin/npapi_host_control/win/stream_operation.h b/o3d/plugin/npapi_host_control/win/stream_operation.h
index c74f436..25f35cb 100644
--- a/o3d/plugin/npapi_host_control/win/stream_operation.h
+++ b/o3d/plugin/npapi_host_control/win/stream_operation.h
@@ -49,7 +49,7 @@
 #include <atlstr.h>
 #include <urlmon.h>
 
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
 
 class NPPluginProxy;
 
diff --git a/o3d/plugin/win/config.cc b/o3d/plugin/win/config.cc
index e47147a..9be4c5c 100644
--- a/o3d/plugin/win/config.cc
+++ b/o3d/plugin/win/config.cc
@@ -55,7 +55,7 @@
 #include "plugin/cross/config.h"
 #include "plugin/cross/plugin_metrics.h"
 #include "core/cross/install_check.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
 
 namespace o3d {
 
diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons
index 318ea72..79d4c78 100644
--- a/o3d/svn_paths.scons
+++ b/o3d/svn_paths.scons
@@ -39,7 +39,7 @@ env.Replace(
     # A whole bunch of third-party and internal dependencies
     ANTLRLIBC_DIR = '$THIRD_PARTY/antlr3/runtime/C',
     ANTLR_DIR = '$THIRD_PARTY/antlr3/lib',
-    BREAKPAD_DIR = '$THIRD_PARTY/breakpad/files/src',
+    BREAKPAD_DIR = '$THIRD_PARTY/breakpad',
     CG_BASE_DIR = '$THIRD_PARTY/cg/files',
     # TODO: pull from Chrome's SVN with gclient ?
     CHROME_SRC_DIR = '$THIRD_PARTY/chrome/files',
@@ -66,10 +66,10 @@ env.Replace(
     # NACL has to be in this weird directory because it looks for
     # googleclient two levels above it.
     NACL_DIR = '$THIRD_PARTY/native_client/googleclient/native_client',
-    NIXYSA_DIR = '$THIRD_PARTY/nixysa/files',
-    NPAPI_DIR = '$THIRD_PARTY/npapi/files',
+    NIXYSA_DIR = '$THIRD_PARTY/nixysa',
+    NPAPI_DIR = '$THIRD_PARTY/npapi',
     PDIFF_DIR = '$THIRD_PARTY/pdiff/files',
-    PLY_DIR = '$THIRD_PARTY/ply/files',
+    PLY_DIR = '$THIRD_PARTY/ply',
     PNG_DIR = '$THIRD_PARTY/png/src',
     SCONS_DIR = '$THIRD_PARTY/scons',
     SELENIUM_JAVA_DIR = '$THIRD_PARTY/java/selenium/rev2478_mod',
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index d1e497bc..80e8da7 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -29,7 +29,8 @@
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../build/nacl.gyp:build_nacl',
-        '../compiler/technique/technique.gyp:technique',
+        '../compiler/technique/technique.gyp:o3dTechnique',
+        '../compiler/technique/technique.gyp:o3dTechniqueTest',
         '../core/core.gyp:o3dCore',
         '../core/core.gyp:o3dCorePlatform',
         '../core/core.gyp:o3dCoreTest',
@@ -45,6 +46,42 @@
         'common/cross/test_utils.cc',
         'common/cross/main.cc',
       ],
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/bitmap_test',
+          'files': [
+            "bitmap_test/5kx5k.dds",
+            "bitmap_test/5kx5k.jpg",
+            "bitmap_test/5kx5k.png",
+            "bitmap_test/5kx5k.tga",
+            "bitmap_test/dds-dxt1-256x256-alpha.dds",
+            "bitmap_test/dds-dxt1-256x256-mipmap.dds",
+            "bitmap_test/dds-dxt1-256x256.dds",
+            "bitmap_test/dds-dxt3-256x256-alpha.dds",
+            "bitmap_test/dds-dxt3-256x256-mipmap.dds",
+            "bitmap_test/dds-dxt5-256x256-alpha.dds",
+            "bitmap_test/dds-dxt5-256x256-mipmap.dds",
+            "bitmap_test/gif-256x256-interlaced.gif",
+            "bitmap_test/gif-256x256.gif",
+            "bitmap_test/jpeg-256x256.jpg",
+            "bitmap_test/png-20x14-4bit-palette.png",
+            "bitmap_test/png-256x256-24bit-interlaced.png",
+            "bitmap_test/png-256x256-24bit.png",
+            "bitmap_test/png-256x256-32bit.png",
+            "bitmap_test/png-256x256-8bit-palette-alpha.png",
+            "bitmap_test/png-256x256-8bit-palette.png",
+            "bitmap_test/png-2x2-24bit-drawimage-src.png",
+            "bitmap_test/png-4x4-24bit-drawimage-argb8-src.png",
+            "bitmap_test/png-4x4-24bit-drawimage-src.png",
+            "bitmap_test/png-8x4-24bit-drawimage-argb8-dest.png",
+            "bitmap_test/png-8x4-24bit-drawimage-dest.png",
+            "bitmap_test/png-8x8-24bit-drawimage-src.png",
+            "bitmap_test/test_source.psd",
+            "bitmap_test/tga-256x256-24bit.tga",
+            "bitmap_test/tga-256x256-32bit.tga",
+          ],
+        },
+      ],
       'conditions' : [
         ['OS == "mac"',
           {