Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89ad07b0 authored May 06, 2010 by Dan Bornstein Committed by Android Git Automerger May 06, 2010

am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo

Merge commit '42ee86e6' into froyo-plus-aosp

* commit '42ee86e6':
  For issue #2651381, allow library prelinking.

parents e96e2358 42ee86e6

native/graphics/jni/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)

packages/TtsService/jni/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,5 @@ LOCAL_MODULE:= libttssynthproxy

		LOCAL_ARM_MODE := arm

		LOCAL_PRELINK_MODULE := false

		include $(BUILD_SHARED_LIBRARY)