resolved conflicts for merge of 6dd2ae02 to eclair

[android-x86/build.git] / core / prelink-linux-arm.map

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index c4e1107..30fa378 100644 (file)
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -50,6 +50,8 @@ libdvm.so               0xAD000000
 
 # graphics
 libpixelflinger.so      0xACF00000
+# libcorecg is for backward-compatibility with donut
+libcorecg.so            0xACE00000
 libsurfaceflinger.so    0xACD00000
 libGLES_android.so      0xACC80000
 libagl.so               0xACC00000
@@ -64,16 +66,20 @@ libacc.so               0xAC600000
 
 libexif.so              0xAC500000
 libui.so                0xAC400000
+# libsgl is for backward-compatibility with donut
+libsgl.so               0xAC200000
 libskia.so              0xAC000000
 librs_jni.so            0xABF00000
 libRS.so                0xAB900000
 
 
 # audio
-libspeech.so            0xAB800000
+libaudiopolicy.so       0xAB880000
+libaudiopolicygeneric.so 0xAB800000
+libsoundpool.so         0xAB780000
 libaudio.so             0xAB700000
-libsonivox.so           0xAB600000
-libsoundpool.so         0xAB500000
+libspeech.so            0xAB600000
+libsonivox.so           0xAB500000
 libvorbisidec.so        0xAB400000
 libmedia_jni.so         0xAB300000
 libmediaplayerservice.so 0xAB280000