summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authormilligan@google.com <milligan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 17:26:24 +0000
committermilligan@google.com <milligan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 17:26:24 +0000
commitfc75fa838f8e15ac4795ec29c35aea85783bb044 (patch)
tree333f68315dcc633aef4bc92a97ee5936eb8b0467 /o3d
parent441c6c3210063f995d3541b45e01e3aaaea80c59 (diff)
downloadchromium_src-fc75fa838f8e15ac4795ec29c35aea85783bb044.zip
chromium_src-fc75fa838f8e15ac4795ec29c35aea85783bb044.tar.gz
chromium_src-fc75fa838f8e15ac4795ec29c35aea85783bb044.tar.bz2
Fix Mac breakpad support for all browsers except for chrome.
This fixes three isues: 1. The URL being used to upload was out of date. 2. The path to the reporter and inspector apps needed to be specified to work around a problem with module address detection in this version of breakpad on mac. 3. The crash inspector was missing from the plugin package. Review URL: http://codereview.chromium.org/6633008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/plugin/mac/Info.plist6
-rwxr-xr-xo3d/plugin/mac/plugin_copy_frameworks.sh4
2 files changed, 9 insertions, 1 deletions
diff --git a/o3d/plugin/mac/Info.plist b/o3d/plugin/mac/Info.plist
index 868d959..9040d17 100644
--- a/o3d/plugin/mac/Info.plist
+++ b/o3d/plugin/mac/Info.plist
@@ -41,6 +41,10 @@
<key>O3DForceSoftwareRenderer</key>
<false/>
+ <key>BreakpadInspectorLocation</key>
+ <string>/Library/Internet Plug-Ins/@@@PluginNpapiFilename@@@.plugin/Contents/Resources/crash_inspector</string>
+ <key>BreakpadReporterExeLocation</key>
+ <string>/Library/Internet Plug-Ins/@@@PluginNpapiFilename@@@.plugin/Contents/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender</string>
<key>BreakpadProduct</key>
<string>O3D</string>
<key>BreakpadProductDisplay</key>
@@ -54,7 +58,7 @@
<key>BreakpadReportInterval</key>
<string>3600</string>
<key>BreakpadURL</key>
- <string>https://clients2.google.com/cr</string>
+ <string>https://clients2.google.com/cr/report</string>
</dict>
</plist>
diff --git a/o3d/plugin/mac/plugin_copy_frameworks.sh b/o3d/plugin/mac/plugin_copy_frameworks.sh
index a920b71..8de8ace 100755
--- a/o3d/plugin/mac/plugin_copy_frameworks.sh
+++ b/o3d/plugin/mac/plugin_copy_frameworks.sh
@@ -14,3 +14,7 @@ find "${BUILT_PRODUCTS_DIR}/${PLUGIN_NPAPI_FILENAME}.plugin/Contents/Frameworks/
ditto --arch i386 \
"${BUILT_PRODUCTS_DIR}/crash_report_sender.app" \
"${BUILT_PRODUCTS_DIR}/${PLUGIN_NPAPI_FILENAME}.plugin/Contents/Resources/crash_report_sender.app"
+
+ditto --arch i386 \
+ "${BUILT_PRODUCTS_DIR}/crash_inspector" \
+ "${BUILT_PRODUCTS_DIR}/${PLUGIN_NPAPI_FILENAME}.plugin/Contents/Resources/crash_inspector"