diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-05-06 12:43:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 12:43:31 -0700 |
| commit | a3bf26f14bd98e38677a685e34cb5d3bfbd4a816 (patch) | |
| tree | 3b3cbdcf52d9bbb22d1bd8d51c02843ba529c8d4 | |
| parent | fdef55a46eec6f9bef7b49bf2daca49828397a44 (diff) | |
| parent | c54863d5d4ff3667e30f859e2d0273e4bb2c4d0f (diff) | |
| download | android_external_iproute2-a3bf26f14bd98e38677a685e34cb5d3bfbd4a816.tar.gz android_external_iproute2-a3bf26f14bd98e38677a685e34cb5d3bfbd4a816.tar.bz2 android_external_iproute2-a3bf26f14bd98e38677a685e34cb5d3bfbd4a816.zip | |
am c54863d5: For issue #2651381, allow library prelinking.
Merge commit 'c54863d5d4ff3667e30f859e2d0273e4bb2c4d0f' into kraken
* commit 'c54863d5d4ff3667e30f859e2d0273e4bb2c4d0f':
For issue #2651381, allow library prelinking.
| -rw-r--r-- | lib/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/Android.mk b/lib/Android.mk index daca9cd..76af7f1 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -27,7 +27,6 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ -DHAVE_EXT2_IOCTLS \ -DHAVE_LINUX_FD_H \ -DHAVE_TYPE_SSIZE_T -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -58,6 +57,4 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ -DHAVE_LINUX_FD_H \ -DHAVE_TYPE_SSIZE_T -LOCAL_PRELINK_MODULE := false - include $(BUILD_SHARED_LIBRARY) |