From ebb09ee4f0b9691895d81c77666b141241683175 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 12 Apr 2013 02:32:42 +0300
Subject: No jvmaccess or jvmfwk library unless SOLAR_JAVA

Change-Id: I676c1305d997d756456245264e68676666f75c7e
---
 Library_merged.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Library_merged.mk')

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 \
-- 
cgit