From df06564392094411105af99f3b478df5668edb07 Mon Sep 17 00:00:00 2001
From: Vasily Litvinov <vasslitvinov@pisem.net>
Date: Tue, 18 Mar 2014 19:22:52 +0400
Subject: [PATCH] Made it so all non-.java files from luni/src/main will be
 added to classpath directory

---
 makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/makefile b/makefile
index c438dbc4c2..d6629db5e0 100755
--- a/makefile
+++ b/makefile
@@ -230,9 +230,8 @@ ifneq ($(android),)
 		$(call cpp-objects,$(libnativehelper-cpps),$(libnativehelper-native),$(build))
 	luni-java = $(android)/libcore/luni/src/main/java
 	luni-javas := $(shell find $(luni-java) -name '*.java')
-	java-prop = $(android)/libcore/luni/src/main/java
-	java-props := $(shell find $(java-prop) -name '*.properties')
-	java-copied-props = $(call java-properties,$(java-props),$(java-prop),)
+	luni-nonjavas := $(shell find $(luni-java) -not -type d -not -name '*.java')
+	luni-copied-nonjavas = $(call noop-files,$(luni-nonjavas),$(luni-java),)
 	libdvm-java = $(android)/libcore/libdvm/src/main/java
 	libdvm-javas := $(shell find $(libdvm-java) -name '*.java')
 	crypto-java = $(android)/libcore/crypto/src/main/java
@@ -1097,7 +1096,7 @@ c-objects = $(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%.o,$(x)))
 cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
 asm-objects = $(foreach x,$(1),$(patsubst $(2)/%.$(asm-format),$(3)/%-asm.o,$(x)))
 java-classes = $(foreach x,$(1),$(patsubst $(2)/%.java,$(3)/%.class,$(x)))
-java-properties = $(foreach x,$(1),$(patsubst $(2)/%.properties,$(3)/%.properties,$(x)))
+noop-files = $(foreach x,$(1),$(patsubst $(2)/%,$(3)/%,$(x)))
 
 generated-code = \
 	$(build)/type-enums.cpp \
@@ -1585,7 +1584,7 @@ $(build)/%.o: $(build)/android-src/%.cpp $(build)/android.dep
 		$$($(windows-path) $(<)) $(call output,$(@))
 
 $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
-		$(dalvik-javas) $(xml-javas) $(java-props)
+		$(dalvik-javas) $(xml-javas) $(luni-nonjavas)
 	@echo "compiling luni classes"
 	@mkdir -p $(classpath-build)
 	@mkdir -p $(build)/android
@@ -1605,8 +1604,8 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
 	rm $(build)/android/sun/misc/Unsafe* \
 		$(build)/android/java/lang/reflect/Proxy*
 	cp -r $(build)/android/* $(classpath-build)
-	for x in $(java-copied-props); \
-		do cp -f $(java-prop)$${x} $(classpath-build)$${x} ; \
+	for x in $(luni-copied-nonjavas); \
+		do cp -f $(luni-java)$${x} $(classpath-build)$${x} ; \
 	done
 	@touch $(@)