Merge "full_x86-eng: Ensure we copy the PC bios files."
diff --git a/core/definitions.mk b/core/definitions.mk
index 17c8089..6e7a5ad 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -980,6 +980,24 @@
## Commands for running ar
###########################################################
+define _concat-if-arg2-not-empty
+$(if $(2),$(hide) $(1) $(2))
+endef
+
+# Split long argument list into smaller groups and call the command repeatedly
+#
+# $(1): the command without arguments
+# $(2): the arguments
+define split-long-arguments
+$(call _concat-if-arg2-not-empty,$(1),$(wordlist 1,500,$(2)))
+$(call _concat-if-arg2-not-empty,$(1),$(wordlist 501,1000,$(2)))
+$(call _concat-if-arg2-not-empty,$(1),$(wordlist 1001,1500,$(2)))
+$(call _concat-if-arg2-not-empty,$(1),$(wordlist 1501,2000,$(2)))
+$(call _concat-if-arg2-not-empty,$(1),$(wordlist 2001,2500,$(2)))
+$(call _concat-if-arg2-not-empty,$(1),$(wordlist 2501,3000,$(2)))
+$(call _concat-if-arg2-not-empty,$(1),$(wordlist 3001,99999,$(2)))
+endef
+
define extract-and-include-target-whole-static-libs
$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \
$(hide) echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \
@@ -1002,8 +1020,7 @@
@rm -f $@
$(extract-and-include-target-whole-static-libs)
@echo "target StaticLib: $(PRIVATE_MODULE) ($@)"
-$(hide) echo $(filter %.o, $^) | \
- xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
+$(call split-long-arguments,$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
endef
###########################################################
@@ -1012,7 +1029,7 @@
define extract-and-include-host-whole-static-libs
$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \
- @echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \
+ $(hide) echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(lib)]"; \
ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(lib)))_objs;\
rm -rf $$ldir; \
mkdir -p $$ldir; \
@@ -1032,8 +1049,7 @@
@rm -f $@
$(extract-and-include-host-whole-static-libs)
@echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
-echo $(filter %.o, $^) | \
- xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
+$(call split-long-arguments,$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
endef
diff --git a/core/main.mk b/core/main.mk
index 858819b..c23112b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -429,6 +429,7 @@
sdk/ninepatch \
sdk/sdkstats \
sdk/sdkmanager \
+ sdk/swtmenubar \
development/apps \
development/tools/mkstubs \
packages
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 40d12b3..e6b8bd0 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -50,11 +50,11 @@
SoftKeyboard \
CubeLiveWallpapers \
QuickSearchBox \
- monkeyrunner \
- guavalib \
- jsr305lib \
+ monkeyrunner \
+ guavalib \
+ jsr305lib \
jython \
- jsilver
+ jsilver
# Host tools that are parts of the SDK.
# See development/build/sdk.atree
@@ -74,7 +74,7 @@
traceview \
android \
dexdump \
- monkeyrunner
+ monkeyrunner
# Native host Java libraries that are parts of the SDK.
# See development/build/sdk.atree
@@ -94,6 +94,7 @@
sdklib \
sdkuilib \
sdkmanager \
+ swtmenubar \
swing-worker-1.1 \
groovy-all-1.7.0 \
commons-compress-1.0 \