merge from open-source master

2009-11-09 10:34:27 -08:00 · 2009-11-09 10:34:27 -08:00 · e1b710a5ba
parent ebed06a259 61a147e3a6
commit e1b710a5ba
2 changed files with 4 additions and 0 deletions
--- a/buildspec.mk.default
+++ b/buildspec.mk.default
@ -68,6 +68,9 @@ endif
 # will be added to LOCAL_CFLAGS when building the module.
 #DEBUG_MODULE_ModuleName:=true

+# Specify an alternative tool chain prefix if needed.
+#TARGET_TOOLS_PREFIX:=
+
 # Specify the extra CFLAGS to use when building a module whose
 # DEBUG_MODULE_ variable is set.  Host and device flags are handled
 # separately.
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@ -74,6 +74,7 @@ libRS.so                0xAB900000


 # audio
+libFLAC.so              0xAB8A0000
 libaudiopolicy.so       0xAB880000
 libaudiopolicygeneric.so 0xAB800000
 libsoundpool.so         0xAB780000