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 bd86397..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,6 +66,8 @@ 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