diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-04-26 08:51:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-28 17:20:07 +0100 |
| commit | b828a6f494cc90e1a135e7442589679993eb2a5c (patch) | |
| tree | 3ee2336b9f90c2ae0030b531330d637dae9b1346 /jvmfwk | |
| parent | 53b552518e1feab4a5cc25bb92ea26dc9b2c7e4f (diff) | |
Related: #i121715# find official JRE>=7 on OSX
(cherry picked from commit a3eded9728647bde4af68b9f3c75a51dc0676fc7)
Conflicts:
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index f488b15653db..38279a653ee6 100644 --- 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 |