From 6581feda8535b45a574cc1a5bece3f0bd0f6a3f2 Mon Sep 17 00:00:00 2001
From: Dan Bornstein <danfuzz@android.com>
Date: Thu, 22 Oct 2009 13:14:41 -0700
Subject: [PATCH] Only put .o files into static libraries when building for the
 host.

In particular don't put the symbol indices from included .a files into
them. I didn't change the equivalent device rule ala the "if it ain't
broke" rule of thumb.

Change-Id: I064ac356a6f48f93fca2cd08a8408ca835f8f9a4
---
 core/definitions.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/definitions.mk b/core/definitions.mk
index 72e0cb103..a7d583870 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -945,7 +945,7 @@ $(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \
 	rm -rf $$ldir; \
 	mkdir -p $$ldir; \
 	filelist=; \
-	for f in `$(HOST_AR) t $(lib)`; do \
+	for f in `$(HOST_AR) t $(lib) | grep '\.o$$'`; do \
 	    $(HOST_AR) p $(lib) $$f > $$ldir/$$f; \
 	    filelist="$$filelist $$ldir/$$f"; \
 	done ; \