commit a67baff9a50be3a335e650d208d51e33e20b70e2
author Eric Laurent <elaurent@google.com> Mon Jun 14 09:38:16 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 14 09:38:16 2010 -0700
tree 3fc955830c367e35fc167fec531ba2ae614d1d5b
parent e46a061d08f9667783d39a60106003497c2ad41e
parent 71affe70fd8f882c7c9cc7a5aca28e714241eb6e

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

Merge commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e' into gingerbread-plus-aosp

* commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e':
  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]