bridges: do not use dl for Android

Change-Id: I1ea75cc785645305223294f1a75b142de9d916d7

bridges: do not use dl for Android
Change-Id: I1ea75cc785645305223294f1a75b142de9d916d7
ce7d6d74 · Matúš Kukan · 1b034ebe · ce7d6d74 · ce7d6d74 · ce7d6d74
Kaydet (Commit) ce7d6d74 authored Eyl 22, 2012 tarafından Matúš Kukan
Showing with 9 additions and 6 deletions

Library_gcc3_linux_arm.mk bridges/Library_gcc3_linux_arm.mk +3 -4

Library_gcc3_linux_intel.mk bridges/Library_gcc3_linux_intel.mk +3 -1

Library_gcc3_linux_mips.mk bridges/Library_gcc3_linux_mips.mk +3 -1

No files found.
--- a/bridges/Library_gcc3_linux_arm.mk
+++ b/bridges/Library_gcc3_linux_arm.mk
@@ -38,13 +38,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\

 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
+	$(if $(filter-out ANDROID,$(OS)),\
+		dl \
+	) \
 	sal \
 ))

-$(eval $(call gb_Library_add_asmobjects,gcc3_uno,\
-))
-
 $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\
 	bridges/source/cpp_uno/shared/bridge \
 	bridges/source/cpp_uno/shared/component \

--- a/bridges/Library_gcc3_linux_intel.mk
+++ b/bridges/Library_gcc3_linux_intel.mk
@@ -41,7 +41,9 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\

 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
+	$(if $(filter-out ANDROID,$(OS)),\
+		dl \
+	) \
 	sal \
 ))


--- a/bridges/Library_gcc3_linux_mips.mk
+++ b/bridges/Library_gcc3_linux_mips.mk
@@ -38,7 +38,9 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\

 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
+	$(if $(filter-out ANDROID,$(OS)),\
+		dl \
+	) \
 	sal \
 ))