diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-15 12:00:46 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 12:00:46 +0200 |
| commit | c301199804f5beb7ef803abfa84e04d9351efb3f (patch) | |
| tree | 991cfa7a033d7fc76e5ea76ca2a10363b1bc5271 /jvmfwk | |
| parent | More String to rtl::OUString conversion while I'm at it. (diff) | |
| parent | Need libfastsax.uno (diff) | |
| download | core-c301199804f5beb7ef803abfa84e04d9351efb3f.tar.gz core-c301199804f5beb7ef803abfa84e04d9351efb3f.zip | |
Merge branch 'feature/android'
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index a8d82581d16e..f28882186ba9 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -65,7 +65,7 @@ #include "diagnostics.h" #ifdef ANDROID -#include <lo-bootstrap.h> +#include <osl/detail/android-bootstrap.h> #endif #if defined HAVE_VALGRIND_H |