diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-04-04 22:46:53 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-04-05 00:18:50 +0300 |
commit | b7525f1f1d123084b60269f420300afdd405b0d1 (patch) | |
tree | 0b2e32b3879a27802c0e607b187c1b43ab697c9e /connectivity/CppunitTest_connectivity_commontools.mk | |
parent | f5928f09ad53de2c4683000619d29be140a97be8 (diff) |
Drop jvmaccess and jvmfwk when no SOLAR_JAVA
Just sprinkle #ifdef SOLAR_JAVA into the code instead.
In the source for jvmaccess and jvmfwk such ifdefs can be removed as
it isn't compiled unless SOLAR_JAVA.
Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
Diffstat (limited to 'connectivity/CppunitTest_connectivity_commontools.mk')
-rw-r--r-- | connectivity/CppunitTest_connectivity_commontools.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index e0f7752edd12..3ececdd9eb84 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -45,7 +45,8 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \ cppu \ cppuhelper \ i18nisolang1 \ - $(if $(filter IOS,$(OS)),,jvmaccess) \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ sal \ salhelper \ test \ |