commit 0e5ce8be34446278a3404ea2a4afc01f20f86c5a
author Dan Albert <danalbert@google.com> Fri May 23 10:41:29 2014 -0700
committer Dan Albert <danalbert@google.com> Fri May 23 18:23:47 2014 -0700
tree ba7a7c00aaf4b0cde2b84fea603ec9426153cf3e
parent 6cb69bd4f20ac3ae3a7d5b5cc323c4480cf8ef75

Fix for duplicate names in whole static libs

_extract-and-include-single-(host|target)-whole-static-lib was written such that
only the first file of a given name would be extracted and included into the new
library. This patch iterates over each identically named archive member,
extracts them individually, and adds them to the new archive.

Bug: 15110069
Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1

core/combo/select.mk

diff --git a/core/combo/select.mk b/core/combo/select.mk
index 8234a8f..506ad08 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -53,7 +53,7 @@
 $(combo_var_prefix)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
 $(combo_var_prefix)GLOBAL_CPPFLAGS :=
 $(combo_var_prefix)GLOBAL_LDFLAGS :=
-$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD
+$(combo_var_prefix)GLOBAL_ARFLAGS := cqsPD
 $(combo_var_prefix)GLOBAL_LD_DIRS :=
 
 $(combo_var_prefix)EXECUTABLE_SUFFIX :=