commit 757b7f7d8917b43c77e43b5653e7674417ba298f
author Jaikumar Ganesh <jaikumar@google.com> Mon Aug 30 13:29:46 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 30 13:29:46 2010 -0700
tree 6bc77b2a90b3d34f1a245e8046f142c9a83950b8
parent 938ebb1b1ab5c724b5b679324aa94836d23aadef
parent 0c01eb3a7313a580fe34044bcdc3337d067c8a15

am 0c01eb3a: (-s ours) DO NOT MERGE Reverse meaning of ANDROID_STUB C flag.

Merge commit '0c01eb3a7313a580fe34044bcdc3337d067c8a15'

* commit '0c01eb3a7313a580fe34044bcdc3337d067c8a15':
  DO NOT MERGE Reverse meaning of ANDROID_STUB C flag.

glib/Android.mk

diff --git a/glib/Android.mk b/glib/Android.mk
index de73704..2a6045f 100755
--- a/glib/Android.mk
+++ b/glib/Android.mk
@@ -43,6 +43,6 @@
 LOCAL_CFLAGS:= \
 	-DANDROID_STUB
 
-LOCAL_MODULE:=libglib_static
+LOCAL_MODULE:=libglib
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)