commit 71affe70fd8f882c7c9cc7a5aca28e714241eb6e
author Eric Laurent <elaurent@google.com> Mon Jun 14 09:37:15 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 14 09:37:15 2010 -0700
tree f5d37461021c869904727aac95bd5ee0aeed2124
parent d7e7e4825293f5b623e07f854d7ed2e3470be586
parent 484d4d5470336b662a5e65a1f10653c4c433cf84

am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken

Merge commit '484d4d5470336b662a5e65a1f10653c4c433cf84' into gingerbread

* commit '484d4d5470336b662a5e65a1f10653c4c433cf84':
  Added prelinked library for audio effects JNI.

core/prelink-linux-arm.map

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index f5643db..fb4443d 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -88,7 +88,8 @@
 # audio
 libFLAC.so              0xA9B00000 # [???]
 libaudiopolicy.so       0xA9A00000 # [~1M]
-libeffects.so           0xA9900000 # [<64K]
+libeffects.so           0xA9980000 # [<64K]
+libaudioeffect_jni.so   0xA9900000 # [<64K]
 libsoundpool.so         0xA9800000 # [~1M]
 libaudio.so             0xA9700000 # [~1M]
 libspeech.so            0xA9600000 # [~1M]