summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeyan Mobli <persiansown@gmail.com>2010-11-20 23:42:42 +0000
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2010-11-20 23:42:42 +0000
commit9766a366faafb2b4a8ba1a8319415e72fc248b1e (patch)
tree383d43d7dbfe7872493ce1ab36ba0f3d0c762f61
parent393ca0768b4e5fd9519e9e6796ab323be004cdc8 (diff)
parent91404d498802d755a2d2f3937ca4266d473c210f (diff)
downloadvendor_replicant-9766a366faafb2b4a8ba1a8319415e72fc248b1e.zip
vendor_replicant-9766a366faafb2b4a8ba1a8319415e72fc248b1e.tar.gz
vendor_replicant-9766a366faafb2b4a8ba1a8319415e72fc248b1e.tar.bz2
Merge "Update prelink map for 2.2 props and prepare for RC2" into froyo
-rw-r--r--prelink-linux-arm-liberty.map18
-rw-r--r--products/cyanogen_liberty.mk2
2 files changed, 10 insertions, 10 deletions
diff --git a/prelink-linux-arm-liberty.map b/prelink-linux-arm-liberty.map
index fd93dee..b0ab297 100644
--- a/prelink-linux-arm-liberty.map
+++ b/prelink-linux-arm-liberty.map
@@ -90,9 +90,10 @@ libFLAC.so 0xA9B00000 # [???]
libaudiopolicy.so 0xA9A00000 # [~1M]
libaudiopolicygeneric.so 0xA9900000 # [???]
libsoundpool.so 0xA9800000 # [~1M]
-libgps.so 0xA9700000 # [~1M] (moved for espresso)
+libaudio.so 0xA9700000 # [~1M]
libspeech.so 0xA9600000 # [~1M]
-liboemcamera.so 0xA9400000 # [~1M] (moved for espresso)
+libsonivox.so 0xA9500000 # [~1M]
+libvorbisidec.so 0xA9400000 # [~1M]
libmedia_jni.so 0xA9300000 # [~1M]
libmediaplayerservice.so 0xA9200000 # [~1M]
libmedia.so 0xA9000000 # [~2M]
@@ -112,13 +113,12 @@ libhardware_legacy.so 0xA7E00000 # [~1M]
libapp_process.so 0xA7D00000 # [???]
libsystem_server.so 0xA7C00000 # [~1M]
libime.so 0xA7B00000 # [???]
-libaudio.so 0xA7A00000 # [~1M] (moved for espresso)
-libcamera.so 0xA7900000 # [~1M]
-libsonivox.so 0xA7800000 # [~1M] (moved for espresso)
-libvorbisidec.so 0xA7700000 # [~1M] (moved for espresso)
-libdiskconfig.so 0xA7600000 # [<64K]
-libemoji.so 0xA7500000 # [<64K]
-libjni_latinime.so 0xA7400000 # [~1M]
+libjni_latinime.so 0xA7A00000 # [~1M]
+libdiskconfig.so 0xA7900000 # [<64K]
+libemoji.so 0xA7800000 # [<64K]
+libgps.so 0xA7700000 # [~1M]
+libcamera.so 0xA7600000 # [~1M]
+liboemcamera.so 0xA7400000 # [~2M]
libjni_pinyinime.so 0xA7300000 # [~1M]
libttssynthproxy.so 0xA7200000 # [~1M] for frameworks/base
libttspico.so 0xA7000000 # [~2M] for external/svox
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 16f7f0b..ede6b33 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -27,7 +27,7 @@ ifdef CYANOGEN_NIGHTLY
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Liberty
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC1-Liberty
+ ro.modversion=CyanogenMod-6.1.0-RC2-Liberty
endif
#