diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-01-31 16:12:15 -0800 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2011-05-06 12:48:48 -0700 |
commit | 4e1e20f508d5a4deff8854cc9f54251f1facad81 (patch) | |
tree | ee99a5cfdd743ae700e234a7fcf0a69442c4df3f | |
parent | 37a032dbe5bda45105139803c4745deb19db0d42 (diff) | |
download | glib-4e1e20f508d5a4deff8854cc9f54251f1facad81.tar.gz |
Fix build - don't prelink glib - do not mergeandroid-sdk-tools_r12android-sdk-adt_r12
Change-Id: I34f96f8a4d0285dbea2cb056c49334d8e80a4dd5
-rwxr-xr-x | glib/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/glib/Android.mk b/glib/Android.mk index 2a6045f39..3d1d35532 100755 --- a/glib/Android.mk +++ b/glib/Android.mk @@ -45,4 +45,6 @@ LOCAL_CFLAGS:= \ LOCAL_MODULE:=libglib +LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) |