Related: #i121715# find official JRE>=7 on OSX

(cherry picked from commit a3eded97) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8

Related: #i121715# find official JRE>=7 on OSX
(cherry picked from commit a3eded97) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8
b828a6f4 · Herbert Dürr · Caolán McNamara · 53b55251 · b828a6f4
Kaydet (Commit) b828a6f4 authored Nis 26, 2013 tarafından Herbert Dürr Kaydeden (comit) Caolán McNamara May 28, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

util.cxx jvmfwk/plugins/sunmajor/pluginlib/util.cxx +1 -0

No files found.
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -95,6 +95,7 @@ char const *g_arCollectDirs[] = {
 char const *g_arSearchPaths[] = {
 #ifdef MACOSX
    "",
+    "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
    "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
 #else
 #ifndef JVM_ONE_PATH_CHECK