commit e1b710a5ba16be660d5383f1e56bd76b664b1d05
author Jean-Baptiste Queru <jbq@google.com> Mon Nov 09 10:34:27 2009 -0800
committer Jean-Baptiste Queru <jbq@google.com> Mon Nov 09 10:34:27 2009 -0800
tree 7d3d271c8d9c5bf4cd99d45d2644df96e1c5d6c1
parent ebed06a259eb1c00112a4e3a9d6d721700bbaedb
parent 61a147e3a6b3e33567fc95f8f13abee7d9cb8a5d

merge from open-source master

buildspec.mk.default

diff --git a/buildspec.mk.default b/buildspec.mk.default
index 06db499..6303efc 100644
--- a/buildspec.mk.default
+++ b/buildspec.mk.default
@@ -68,6 +68,9 @@
 # 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.

core/prelink-linux-arm.map

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index 30fa378..64149bc 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -74,6 +74,7 @@
 
 
 # audio
+libFLAC.so              0xAB8A0000
 libaudiopolicy.so       0xAB880000
 libaudiopolicygeneric.so 0xAB800000
 libsoundpool.so         0xAB780000