summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-27 14:10:57 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-28 09:58:14 -0400
commit77169b9ceccfedeadef272f701425430cf1c719d (patch)
treeece581b269674a1b4653c786e33793963ff06307 /Library_merged.mk
parent679ab714380c4e4508f123a6c6f6691289c9a653 (diff)
add javavm and jvmfwk to Library_merged
Change-Id: Ia59027e4eb9909b6afeab6dc6c7f76a6b60cd1c6
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 45119e9b7021..db8991dbf75e 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nisolang1 \
- jvmfwk \
sal \
salhelper \
tl \