From: Roland Levillain Date: Thu, 23 Oct 2014 15:40:59 +0000 (+0100) Subject: Use test's `-d' option when checking for a directory. X-Git-Tag: android-x86-7.1-r1~889^2~2797^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=560b5ac4117602611b2b9d8ba886d120e9cf3fed;p=android-x86%2Fart.git Use test's `-d' option when checking for a directory. Change-Id: I2d46ba01ec13daa7aa0b78e447eccbc4f1527a19 --- diff --git a/test/etc/default-build b/test/etc/default-build index 009736b09..3369dc653 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -20,7 +20,7 @@ set -e mkdir classes ${JAVAC} -d classes `find src -name '*.java'` -if [ -r src2 ]; then +if [ -d src2 ]; then ${JAVAC} -d classes `find src2 -name '*.java'` fi @@ -28,13 +28,13 @@ if [ ${NEED_DEX} = "true" ]; then ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes fi -if [ -r smali ]; then +if [ -d smali ]; then # Compile Smali classes ${SMALI} -JXmx256m --output smali_classes.dex `find smali -name '*.smali'` ${DXMERGER} classes.dex classes.dex smali_classes.dex fi -if [ -r src-ex ]; then +if [ -d src-ex ]; then mkdir classes-ex ${JAVAC} -d classes-ex -cp classes `find src-ex -name '*.java'` if [ ${NEED_DEX} = "true" ]; then