commit 06f88f578976fc5fe75cede1b556185931406186
author Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 16:23:23 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 16:23:23 2009 -0700
tree 488a445727f39279a0affa4528ef8535e09e52f2
parent a14deb7eaf2d524cabb4b40aaad7b935b142bdb3
parent 73a075d8b2e91dd154123117105095ee3cf35e3a

Merge change 6571

* changes:
  Since we're using gcc 4.4 in master, we can use the -Werror= option to make not having a virtual destructor in classes with virtual methods an error. I already fixed all code that had this problem, so now it's a matter of turning the option on. Also, as long as we don't have any C-specific options, it's probably best to copy the CPP flags from the C flags. We can always break them out later.

core/prelink-linux-arm.map

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index 44e5d06..b6688e4 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -50,7 +50,6 @@
 
 # graphics
 libpixelflinger.so      0xACF00000
-libcorecg.so            0xACE00000
 libsurfaceflinger.so    0xACD00000
 libGLES_android.so      0xACC80000
 libagl.so               0xACC00000
@@ -65,7 +64,7 @@
 
 libexif.so              0xAC500000
 libui.so                0xAC400000
-libsgl.so               0xAC000000
+libskia.so              0xAC000000
 
 # audio
 libspeech.so            0xAB800000