diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-12 02:32:42 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-12 02:32:42 +0300 |
| commit | ebb09ee4f0b9691895d81c77666b141241683175 (patch) | |
| tree | e51b612ea9eef67221f8400b6f0c960df98378b7 /Library_merged.mk | |
| parent | 1a6b1873ce75fa9a37c9e69812d127628e0be379 (diff) | |
No jvmaccess or jvmfwk library unless SOLAR_JAVA
Change-Id: I676c1305d997d756456245264e68676666f75c7e
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 7385553569df..59edec136213 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -34,8 +34,9 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nlangtag \ - jvmaccess \ - jvmfwk \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess \ + jvmfwk) \ sal \ salhelper \ tl \ |