diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-02-09 15:21:58 -0800 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-02-09 15:21:58 -0800 |
commit | 2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35 (patch) | |
tree | 4fb0c17213478cef44346829eccc4f6fad2b546f | |
parent | 757b7f7d8917b43c77e43b5653e7674417ba298f (diff) | |
parent | 7131fba22d78b495ad69f3d63a505d27af129129 (diff) | |
download | glib-2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35.tar.gz |
Merge "disable prelinking - do not merge"
-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..9f3c71447 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) |