diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-05-06 12:43:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 12:43:52 -0700 |
| commit | ea5477c85445d743284b365b90171c867315ec48 (patch) | |
| tree | 4f18d74733461452991c54d71c82a34348815d65 /native | |
| parent | 73bbcc4d025bd64401517943200f46c0dfecdf99 (diff) | |
| parent | 89ad07b048ff035394596d6a8916f639f3f0b868 (diff) | |
| download | frameworks_base-ea5477c85445d743284b365b90171c867315ec48.zip frameworks_base-ea5477c85445d743284b365b90171c867315ec48.tar.gz frameworks_base-ea5477c85445d743284b365b90171c867315ec48.tar.bz2 | |
am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '89ad07b048ff035394596d6a8916f639f3f0b868' into kraken
* commit '89ad07b048ff035394596d6a8916f639f3f0b868':
For issue #2651381, allow library prelinking.
Diffstat (limited to 'native')
| -rw-r--r-- | native/graphics/jni/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk index b7ae4a9..7b741db 100644 --- a/native/graphics/jni/Android.mk +++ b/native/graphics/jni/Android.mk @@ -3,8 +3,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_PRELINK_MODULE := false - # setup for skia optimizations # ifneq ($(ARCH_ARM_HAVE_VFP),true) |