Fixing several problems with the build.

- Had to make one line file_path_utils conditional on which build
  system was building it (because GYP build and scons build use
  different versions of chrome/base).

- Missed a couple instances of "file/" in the path to nixysa.

- New version of breakpad has a different API on the Mac.
Review URL: http://codereview.chromium.org/160056

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

4 files changed, 9 insertions, 5 deletions

diff --git a/o3d/command_buffer/service/cross/plugin.cc b/o3d/command_buffer/service/cross/plugin.cc
index b85dbbe8..352a084 100644
--- a/o3d/command_buffer/service/cross/plugin.cc
+++ b/o3d/command_buffer/service/cross/plugin.cc
@@ -49,7 +49,7 @@
 #include "command_buffer/service/win/d3d9/gapi_d3d9.h"
 #endif
 #include "third_party/native_client/googleclient/native_client/src/trusted/desc/nrd_all_modules.h"
-#include "third_party/nixysa/files/static_glue/npapi/npn_api.h"
+#include "third_party/nixysa/static_glue/npapi/npn_api.h"
 
 namespace o3d {
 namespace command_buffer {
diff --git a/o3d/documentation/build_docs.py b/o3d/documentation/build_docs.py
index cc531a6..940f55f 100755
--- a/o3d/documentation/build_docs.py
+++ b/o3d/documentation/build_docs.py
@@ -163,7 +163,7 @@ def RunNixysa(idl_files, generate, output_dir, nixysa_options):
   python_exe = 'python'

   Execute([

     python_exe,

-    MakePath('../third_party/nixysa/files/codegen.py'),

+    MakePath('../third_party/nixysa/codegen.py'),

     '--binding-module=o3d:%s' % MakePath('../plugin/o3d_binding.py'),

     '--generate=' + generate,

     '--force',

@@ -359,4 +359,3 @@ def main():
 

 if __name__ == '__main__':

   main()

-

diff --git a/o3d/plugin/mac/plugin_mac.mm b/o3d/plugin/mac/plugin_mac.mm
index 5df3b88..0714ad5 100644
--- a/o3d/plugin/mac/plugin_mac.mm
+++ b/o3d/plugin/mac/plugin_mac.mm
@@ -256,7 +256,8 @@ void RenderTimer::TimerCallback(CFRunLoopTimerRef timer, void* info) {
 
 bool ExceptionCallback(int exception_type,
                        int exception_code,
-                       mach_port_t crashing_thread) {
+                       mach_port_t crashing_thread,
+                       void* context) {
   return BreakpadEnabler::IsEnabled();
 }
 
@@ -266,7 +267,7 @@ void InitializeBreakpad() {
     NSDictionary* info = [bundle infoDictionary];
 
     gBreakpadRef = BreakpadCreate(info);
-    BreakpadSetFilterCallback(gBreakpadRef, ExceptionCallback);
+    BreakpadSetFilterCallback(gBreakpadRef, ExceptionCallback, NULL);
   }
 }
 
diff --git a/o3d/utils/cross/file_path_utils.cc b/o3d/utils/cross/file_path_utils.cc
index bea30de..d62c417 100644
--- a/o3d/utils/cross/file_path_utils.cc
+++ b/o3d/utils/cross/file_path_utils.cc
@@ -173,7 +173,11 @@ bool FindFileHelper(const FilePath& path_to_search,
                     const FilePath& path_to_find,
                     FilePath* found_path) {
   std::vector<FilePath::StringType> parts;
+#ifdef GYP_BUILD
   path_to_find.GetComponents(&parts);
+#else
+  file_util::PathComponents(path_to_find, &parts);
+#endif
 
   for (size_t ii = 0; ii < parts.size(); ++ii) {
     // build a path from parts.