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.
This commit is contained in:
Dan Bornstein
2010-05-06 12:43:52 -07:00
committed by Android Git Automerger
2 changed files with 0 additions and 4 deletions

View File

@@ -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)

View File

@@ -25,7 +25,5 @@ LOCAL_MODULE:= libttssynthproxy
LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY)