diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-09 17:24:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-09 17:27:20 +0200 |
| commit | 2ceeee914e3ff69811ca04ecccf30a582c58b34a (patch) | |
| tree | bba87c6d0d2c783ce47134349f7c8fd5dc19c932 /jvmfwk/Library_jvmfwk.mk | |
| parent | UNO_JAVA_JFW_PLUGIN is long gone (diff) | |
| download | core-2ceeee914e3ff69811ca04ecccf30a582c58b34a.tar.gz core-2ceeee914e3ff69811ca04ecccf30a582c58b34a.zip | |
Remove jvmfwk plugin feature
...which was effectively unused; there only ever was a single sunjavaplugin that
is now folded directly into jvmfwk. Leaves room for further clean up.
Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b
Diffstat (limited to 'jvmfwk/Library_jvmfwk.mk')
| -rw-r--r-- | jvmfwk/Library_jvmfwk.mk | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index f47caa2ec867..5b99f5869acc 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -13,16 +13,30 @@ $(eval $(call gb_Library_add_defs,jvmfwk,\ -DJVMFWK_DLLIMPLEMENTATION \ )) +ifneq ($(JVM_ONE_PATH_CHECK),) +$(eval $(call gb_Library_add_defs,jvmfwk,\ + -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" \ +)) +endif + $(eval $(call gb_Library_use_api,jvmfwk,\ udkapi \ )) $(eval $(call gb_Library_use_libraries,jvmfwk,\ + cppu \ cppuhelper \ sal \ + salhelper \ $(gb_UWINAPI) \ )) +ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_use_libraries,jvmfwk,\ + lo-bootstrap \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ advapi32 \ @@ -32,9 +46,18 @@ endif $(eval $(call gb_Library_use_externals,jvmfwk,\ boost_headers \ libxml2 \ + valgrind \ )) $(eval $(call gb_Library_add_exception_objects,jvmfwk,\ + jvmfwk/plugins/sunmajor/pluginlib/gnujre \ + jvmfwk/plugins/sunmajor/pluginlib/otherjre \ + jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin \ + jvmfwk/plugins/sunmajor/pluginlib/sunjre \ + jvmfwk/plugins/sunmajor/pluginlib/sunversion \ + jvmfwk/plugins/sunmajor/pluginlib/util \ + jvmfwk/plugins/sunmajor/pluginlib/vendorbase \ + jvmfwk/plugins/sunmajor/pluginlib/vendorlist \ jvmfwk/source/elements \ jvmfwk/source/framework \ jvmfwk/source/fwkbase \ |