From 23f70ffd9d67de4fbf856f9cb71b5315a39033ba Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Mon, 27 Jul 2009 07:01:00 -0500
Subject: [PATCH 1/3] Update prelink map for libFLAC

---
 core/prelink-linux-arm.map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index c8e0db5a63..eb42ad3661 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -67,6 +67,7 @@ libui.so                0xAC400000
 libsgl.so               0xAC000000
 
 # audio
+libFLAC.so              0xAB900000
 libspeech.so            0xAB800000
 libaudio.so             0xAB700000
 libsonivox.so           0xAB600000

From 7d3d4a5af145099843a88674889da336f4291c5b Mon Sep 17 00:00:00 2001
From: Keith Deacon <keith.deacon@gmail.com>
Date: Wed, 7 Jan 2009 08:50:05 -0600
Subject: [PATCH 2/3] Added a default to specify an alternative tool chain
 prefix if needed.

---
 buildspec.mk.default | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/buildspec.mk.default b/buildspec.mk.default
index 861bb0d9f4..659b9f6033 100644
--- a/buildspec.mk.default
+++ b/buildspec.mk.default
@@ -44,6 +44,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.

From ceb18f8923ca85203094b2b0702f5d81c0622c46 Mon Sep 17 00:00:00 2001
From: akushner <akushner@gmail.com>
Date: Thu, 5 Nov 2009 12:49:27 -0800
Subject: [PATCH 3/3] Added prune options to findleaves.sh to ignore the .git
 and .repo directories since the Android.mk files will not be found in these
 directories.

Prunning out these directories decreased the make parse by nearly
a minute on a cold cache and eliminated 60,000+ stats on files in
the .git and .repo directories.
---
 core/main.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/main.mk b/core/main.mk
index aaf5a76e2f..97e49f44b0 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -422,7 +422,7 @@ endif	# !SDK_ONLY
 # Can't use first-makefiles-under here because
 # --mindepth=2 makes the prunes not work.
 subdir_makefiles += \
-	$(shell build/tools/findleaves.sh --prune="./out" $(subdirs) Android.mk)
+	$(shell build/tools/findleaves.sh --prune="*\.git*" --prune="*\.repo*" --prune="./out" $(subdirs) Android.mk)
 
 # Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)
 # or under vendor/*/$(TARGET_DEVICE).  Search in both places, but