commit 15d151367482b6ed47cecf1a578b365b7c6ccab3
author Keun young Park <keunyoung@google.com> Wed May 30 20:30:29 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 30 20:30:29 2012 -0700
tree 1a5b93a38bd65b35e4638360029421af4dafb141
parent 36e4e050ff52956fc4afe60c156e81c2016304c4
parent e581d866fb66fde65f63bbce4bd255400fa1bdb7

Merge "change location of apns-conf.xml and vold.conf" into jb-dev

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 72a43cc..b88399e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -842,8 +842,8 @@
 platform-java: platform
 
 # Dist the platform.zip
-ifneq (,$(filter platform, $(MAKECMDGOALS)))
-$(call dist-for-goals, platform, $(INSTALLED_PLATFORM_ZIP))
+ifneq (,$(filter platform platform-java, $(MAKECMDGOALS)))
+$(call dist-for-goals, platform platform-java, $(INSTALLED_PLATFORM_ZIP))
 endif
 
 #######

core/node_fns.mk

diff --git a/core/node_fns.mk b/core/node_fns.mk
index 38ecea7..40abff7 100644
--- a/core/node_fns.mk
+++ b/core/node_fns.mk
@@ -98,7 +98,7 @@
 space := $(empty) $(empty)
 define uniq-word
 $(strip \
-  $(if $(filter $(2),$(1)), \
+  $(if $(filter-out 0 1,$(words $(filter $(2),$(1)))), \
     $(eval h := |||$(subst $(space),|||,$(strip $(1)))|||) \
     $(eval h := $(subst |||$(strip $(2))|||,|||$(space)|||,$(h))) \
     $(eval h := $(word 1,$(h)) $(2) $(wordlist 2,9999,$(h))) \