Allow for a slightly larger libwebcore, add another library to the list,

correct/update a couple entries, and add a couple more comments.

Bug: 2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index cb4535e..22f5f34 100644 (file)
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -28,7 +28,7 @@ libthread_db.so         0xAF800000 # [<64K]
 libz.so                 0xAF700000 # [~1M]
 libevent.so             0xAF600000 # [???]
 libssl.so               0xAF400000 # [~2M]
-libcrypto.so            0xAF000000 # [~5M]
+libcrypto.so            0xAF000000 # [~4M]
 libsysutils.so          0xAEF00000 # [~1M]
 
 # bluetooth
@@ -98,80 +98,81 @@ libmedia_jni.so         0xA9300000 # [~1M]
 libmediaplayerservice.so 0xA9200000 # [~1M]
 libmedia.so             0xA9000000 # [~2M]
 libFFTEm.so             0xA8F00000 # [~1M]
-libSR_AudioIn.so        0xA8E00000 # [<64K]
+libSR_AudioIn.so        0xA8E00000 # [~1M] for external/srec
 libaudioflinger.so      0xA8D00000 # [~1M]
 
 # assorted system libraries
 libsqlite.so            0xA8B00000 # [~2M]
 libexpat.so             0xA8A00000 # [~1M]
-libwebcore.so           0xA8400000 # [~6M] 
-libbinder.so            0xA8300000 # [~1M]
-libutils.so             0xA8200000 # [~1M]
-libcameraservice.so     0xA8100000 # [~1M]
-libhardware.so          0xA8000000 # [<64K]
-libhardware_legacy.so   0xA7F00000 # [~1M]
-libapp_process.so       0xA7E00000 # [???]
-libsystem_server.so     0xA7D00000 # [~1M]
-libime.so               0xA7C00000 # [???]
-libgps.so               0xA7B00000 # [~1M]
-libcamera.so            0xA7A00000 # [~1M]
-liboemcamera.so         0xA7800000 # [~2M]
-libdiskconfig.so        0xA7700000 # [<64K]
-libemoji.so             0xA7600000 # [<64K]
-libjni_latinime.so      0xA7500000 # [~1M]
-libjni_pinyinime.so     0xA7400000 # [~1M]
-libttssynthproxy.so     0xA7300000 # [~1M]
-libttspico.so           0xA7100000 # [~2M]
+libwebcore.so           0xA8300000 # [~7M]
+libbinder.so            0xA8200000 # [~1M]
+libutils.so             0xA8100000 # [~1M]
+libcameraservice.so     0xA8000000 # [~1M]
+libhardware.so          0xA7F00000 # [<64K]
+libhardware_legacy.so   0xA7E00000 # [~1M]
+libapp_process.so       0xA7D00000 # [???]
+libsystem_server.so     0xA7C00000 # [~1M]
+libime.so               0xA7B00000 # [???]
+libgps.so               0xA7A00000 # [~1M]
+libcamera.so            0xA7900000 # [~1M]
+liboemcamera.so         0xA7700000 # [~2M]
+libdiskconfig.so        0xA7600000 # [<64K]
+libemoji.so             0xA7500000 # [<64K]
+libjni_latinime.so      0xA7400000 # [~1M]
+libjni_pinyinime.so     0xA7300000 # [~1M]
+libttssynthproxy.so     0xA7200000 # [~1M] for frameworks/base
+libttspico.so           0xA7000000 # [~2M] for external/svox
 
 # pv libraries
-libpvasf.so                    0xA7000000 # [???]
-libpvasfreg.so                 0xA6F00000 # [???]
-libomx_sharedlibrary.so        0xA6E00000 # [~1M]
-libopencore_download.so        0xA6D00000 # [~1M]
-libopencore_downloadreg.so     0xA6C00000 # [~1M]
-libopencore_net_support.so     0xA6900000 # [~3M]
-libopencore_rtsp.so            0xA6300000 # [~6M]
-libopencore_rtspreg.so         0xA6200000 # [~1M]
-libopencore_author.so          0xA5E00000 # [~4M]
-libomx_aacdec_sharedlibrary.so 0xA5C00000 # [~2M]
-libomx_amrdec_sharedlibrary.so 0xA5B00000 # [~1M]
-libomx_amrenc_sharedlibrary.so 0xA5A00000 # [~1M]
-libomx_avcdec_sharedlibrary.so 0xA5900000 # [~1M]
-libomx_avcenc_sharedlibrary.so 0xA5800000 # [???]
-libomx_m4vdec_sharedlibrary.so 0xA5700000 # [~1M]
-libomx_m4venc_sharedlibrary.so 0xA5600000 # [???]
-libomx_mp3dec_sharedlibrary.so 0xA5500000 # [~1M]
-libopencore_mp4local.so        0xA5300000 # [~2M]
-libopencore_mp4localreg.so     0xA5200000 # [~1M]
-libopencore_player.so          0xA4900000 # [~9M]
+libpvasf.so                    0xA6F00000 # [???]
+libpvasfreg.so                 0xA6E00000 # [???]
+libomx_sharedlibrary.so        0xA6D00000 # [~1M]
+libopencore_download.so        0xA6C00000 # [~1M]
+libopencore_downloadreg.so     0xA6B00000 # [~1M]
+libopencore_net_support.so     0xA6800000 # [~3M]
+libopencore_rtsp.so            0xA6200000 # [~6M]
+libopencore_rtspreg.so         0xA6100000 # [~1M]
+libopencore_author.so          0xA5D00000 # [~4M]
+libomx_aacdec_sharedlibrary.so 0xA5B00000 # [~2M]
+libomx_amrdec_sharedlibrary.so 0xA5A00000 # [~1M]
+libomx_amrenc_sharedlibrary.so 0xA5900000 # [~1M]
+libomx_avcdec_sharedlibrary.so 0xA5800000 # [~1M]
+libomx_avcenc_sharedlibrary.so 0xA5700000 # [???]
+libomx_m4vdec_sharedlibrary.so 0xA5600000 # [~1M]
+libomx_m4venc_sharedlibrary.so 0xA5500000 # [???]
+libomx_mp3dec_sharedlibrary.so 0xA5400000 # [~1M]
+libopencore_mp4local.so        0xA5200000 # [~2M]
+libopencore_mp4localreg.so     0xA5100000 # [~1M]
+libopencore_player.so          0xA4800000 # [~9M]
 
 # opencore hardware support
-libmm-adspsvc.so              0xA4800000 # [???]
-libOmxCore.so                 0xA4700000 # [<64K]
-libOmxMpeg4Dec.so             0xA4600000 # [???]
-libOmxH264Dec.so              0xA4500000 # [???]
-libOmxVidEnc.so               0xA4400000 # [~1M]
-libopencorehw.so              0xA4300000 # [~1M]
-libOmxVdec.so                 0xA4200000 # [~1M]
-libmm-omxcore.so              0xA4100000 # [<64K]
+libmm-adspsvc.so              0xA4700000 # [<64K]
+libOmxCore.so                 0xA4600000 # [<64K]
+libOmxMpeg4Dec.so             0xA4500000 # [~1M]
+libOmxH264Dec.so              0xA4400000 # [~1M]
+libOmxVidEnc.so               0xA4300000 # [~1M]
+libopencorehw.so              0xA4200000 # [~1M]
+libOmxVdec.so                 0xA4100000 # [~1M]
+libmm-omxcore.so              0xA4000000 # [<64K]
 
 # pv libraries
-libopencore_common.so         0xA3A00000 # [~7M]
-libqcomm_omx.so               0xA3900000 # [<64K]
+libopencore_common.so         0xA3900000 # [~7M]
+libqcomm_omx.so               0xA3800000 # [<64K]
 
 # stagefright libraries
-libstagefright_amrnb_common.so     0xA3800000 # [~1M]
-libstagefright_avc_common.so       0xA3700000 # [~1M]
-libstagefright_color_conversion.so 0xA3600000 # [<64K]
-libstagefright_omx.so              0xA3500000 # [~1M]
-libstagefrighthw.so                0xA3400000 # [~1M]
-libstagefright.so                  0xA3000000 # [~4M]
+libstagefright_amrnb_common.so     0xA3700000 # [~1M]
+libstagefright_avc_common.so       0xA3600000 # [~1M]
+libstagefright_color_conversion.so 0xA3500000 # [<64K]
+libstagefright_omx.so              0xA3400000 # [~1M]
+libstagefrighthw.so                0xA3300000 # [~1M]
+libstagefright.so                  0xA2F00000 # [~4M]
 
 # libraries for specific hardware
-libgsl.so               0xA2F00000 # [~1M]
-libhtc_acoustic.so      0xA2E00000 # [<64K]
-libhtc_ril.so           0xA2D00000 # [~1M]
-liblvmxipc.so           0xA2C00000 # [~1M]
+libgsl.so               0xA2E00000 # [~1M]
+libhtc_acoustic.so      0xA2D00000 # [<64K]
+libhtc_ril.so           0xA2C00000 # [~1M]
+liblvmxipc.so           0xA2B00000 # [~1M] for vendor/nxp
+libreference-cdma-sms.so 0xA2A00000 # [<64K] for hardware/ril
 
 # libraries for specific apps or temporary libraries
 libcam_ipl.so           0x9F000000 # [???]