diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-05-06 12:36:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 12:36:05 -0700 |
| commit | 89ad07b048ff035394596d6a8916f639f3f0b868 (patch) | |
| tree | 244806e5ef9f6e79279202ed093146b2183c54ef | |
| parent | e96e235865830e2f0ee54e22feb20f26c3390999 (diff) | |
| parent | 42ee86e66d972dcdf240e549e5fdc151a144af64 (diff) | |
| download | frameworks_base-89ad07b048ff035394596d6a8916f639f3f0b868.zip frameworks_base-89ad07b048ff035394596d6a8916f639f3f0b868.tar.gz frameworks_base-89ad07b048ff035394596d6a8916f639f3f0b868.tar.bz2 | |
am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '42ee86e66d972dcdf240e549e5fdc151a144af64' into froyo-plus-aosp
* commit '42ee86e66d972dcdf240e549e5fdc151a144af64':
For issue #2651381, allow library prelinking.
| -rw-r--r-- | native/graphics/jni/Android.mk | 2 | ||||
| -rwxr-xr-x | packages/TtsService/jni/Android.mk | 2 |
2 files changed, 0 insertions, 4 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) diff --git a/packages/TtsService/jni/Android.mk b/packages/TtsService/jni/Android.mk index 665d6d2..b41759a 100755 --- a/packages/TtsService/jni/Android.mk +++ b/packages/TtsService/jni/Android.mk @@ -25,7 +25,5 @@ LOCAL_MODULE:= libttssynthproxy LOCAL_ARM_MODE := arm -LOCAL_PRELINK_MODULE := false - include $(BUILD_SHARED_LIBRARY) |