summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-27 14:49:38 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-28 09:58:17 -0400
commitb270066390132819b749d704ced9db69268ee120 (patch)
treeb1072b3f65dee3f7b1638f526547ee6b6f6fdbb4 /Library_merged.mk
parentc74f2edfce221960fe546e88f2b3222d69d53598 (diff)
add javaloader, java_uno, juh, and jvmaccess to Library_merged
Change-Id: I9841860d7c7d34310b99ee339d7835e909702d4f
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 651f608e7426..7efcf9ec025e 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -87,12 +87,6 @@ $(eval $(call gb_Library_use_externals,merged,\
))
endif
-ifneq ($(OS),IOS)
-$(eval $(call gb_Library_use_libraries,merged,\
- jvmaccess \
-))
-endif
-
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_use_externals,merged,\
fontconfig \