From f70ec251ce15f0a86ac2fd29ee27e926df9557a0 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Sat, 5 Apr 2014 01:19:52 +0400 Subject: [PATCH] Fixing indentation --- makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/makefile b/makefile index da17f3b8a1..4c2b291fa9 100755 --- a/makefile +++ b/makefile @@ -1587,13 +1587,13 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \ cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \ $(xml-java)/* $(build)/android-src/ - ifeq ($(platform),windows) - # convert line endings... otherwise patches are difficult - # do that by first "dry-running" the patch to determine which files are patched - patch -d $(build)/android-src -p1 --dry-run -f < android-patches.diff | \ - grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \ - ( cd $(build)/android-src && xargs dos2unix ) - endif +ifeq ($(platform),windows) + # convert line endings... otherwise patches are difficult + # do that by first "dry-running" the patch to determine which files are patched + patch -d $(build)/android-src -p1 --dry-run -f < android-patches.diff | \ + grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \ + ( cd $(build)/android-src && xargs dos2unix ) +endif # now patch the files ( cd $(build)/android-src && patch -p1 ) < android-patches.diff