From 4d7b9557052a31319b0583b46340fbc64de056c5 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Sun, 12 Aug 2012 18:06:31 +0200
Subject: libmerged: add more libraries

Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05
---
 android/qa/desktop/Makefile | 5 -----
 android/qa/sc/Makefile      | 4 ----
 android/qa/simple/Makefile  | 4 ++--
 3 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'android/qa')

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 734cb56bab91..5e74d68626df 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -103,8 +103,6 @@ copy-stuff: buildrcs
 		  gcc3_uno \
 		  hyphenlo \
 		  i18nisolang1gcc3 \
-		  i18npool.uno \
-		  i18nutilgcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  iculelo \
@@ -114,7 +112,6 @@ copy-stuff: buildrcs
 		  libotouchlo \
 		  introspection.uno \
 		  lnthlo \
-		  localebe1.uno \
 		  localedata_en \
 		  localedata_es \
 		  localedata_euro \
@@ -124,7 +121,6 @@ copy-stuff: buildrcs
 		  ooxlo \
 		  reflection.uno \
 		  reg \
-		  saxlo \
 		  spelllo \
 		  stocservices.uno \
 		  store \
@@ -138,7 +134,6 @@ copy-stuff: buildrcs
 		  unordflo \
 		  unotest \
 		  unoxmllo \
-		  utllo \
 		  vbahelperlo \
 		  xml2 \
 		  xmlreader \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a455939407bd..3cc0a6404f83 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -72,8 +72,6 @@ copy-stuff:
 		  frmlo \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
-		  i18npool.uno \
-		  i18nutilgcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  iculelo \
@@ -90,7 +88,6 @@ copy-stuff:
 		  ooxlo \
 		  reflection.uno \
 		  reg \
-		  saxlo \
 		  sclo \
 		  scfiltlo \
 		  stocservices.uno \
@@ -106,7 +103,6 @@ copy-stuff:
 		  unoexceptionprotector \
 		  unotest \
 		  unoxmllo \
-		  utllo \
 		  vbahelperlo \
 		  xml2 \
 		  xmlreader \
diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile
index fa97425c1104..2ce7bd3bc736 100644
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@@ -66,12 +66,12 @@ copy-stuff:
 		  comphelpgcc3 \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
-		  i18nutilgcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  icuuclo \
 		  localedata_en \
 		  localedata_others \
+		  mergedlo \
 		  reg \
 		  store \
 		  ucbhelper4gcc3 \
@@ -82,7 +82,7 @@ copy-stuff:
 		  xml2 \
 		  xmlreader \
 		  bootstrap.uno \
-		  i18npool.uno); do \
+		  ); do \
 	    $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
 	done
 #
-- 
cgit