From c4e194b63f3ecd78c8675934549fa478d40b9a32 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Sun, 30 Mar 2014 23:10:48 +0400 Subject: [PATCH] Small refactoring of the non-class file copying --- makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index e730aeba23..ae70d9ae6a 100755 --- a/makefile +++ b/makefile @@ -1592,14 +1592,14 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \ @$(build)/android.txt rm $(build)/android/sun/misc/Unsafe* \ $(build)/android/java/lang/reflect/Proxy* - cp -r $(build)/android/* $(classpath-build) for x in $(luni-copied-nonjavas); \ - do cp $(luni-java)$${x} $(classpath-build)$${x} ; \ + do cp $(luni-java)$${x} $(build)/android$${x} ; \ done # fix security.properties - get rid of "com.android" in front of classes starting with "org" sed -i -e 's/\(.*=\)com\.android\.\(org\..*\)/\1\2/g' \ - $(classpath-build)/java/security/security.properties - chmod +w $(classpath-build)/java/security/security.properties + $(build)/android/java/security/security.properties + chmod +w $(build)/android/java/security/security.properties + cp -r $(build)/android/* $(classpath-build) @touch $(@) $(test-build)/%.class: $(test)/%.java