From 570b5447bf46faa6493a2d759214161b37a502fd Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Tue, 18 Mar 2014 09:49:00 -0600
Subject: [PATCH] fix openjdk and android builds when continuations=true

Also, update the whitespace padding for printing test results to
accommodate long names like extra.ComposableContinuations.
---
 makefile                  | 4 +++-
 test/test.sh              | 6 +++---
 unittest/test-harness.cpp | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index 66f6baab72..49df1d16b0 100755
--- a/makefile
+++ b/makefile
@@ -192,7 +192,7 @@ ifneq ($(android),)
 	crypto-native := $(android)/libcore/crypto/src/main/native
 
 	ifeq ($(platform),windows)
-    	crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
+		crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
 		android-cflags += -D__STDC_CONSTANT_MACROS
 		blacklist = $(luni-native)/java_io_Console.cpp \
 			$(luni-native)/java_lang_ProcessManager.cpp \
@@ -1337,6 +1337,8 @@ ifneq ($(classpath),avian)
 		$(classpath-src)/avian/ConstantPool.java \
 		$(classpath-src)/avian/Continuations.java \
 		$(classpath-src)/avian/FieldAddendum.java \
+		$(classpath-src)/avian/Function.java \
+		$(classpath-src)/avian/FunctionReceiver.java \
 		$(classpath-src)/avian/IncompatibleContinuationException.java \
 		$(classpath-src)/avian/Machine.java \
 		$(classpath-src)/avian/MethodAddendum.java \
diff --git a/test/test.sh b/test/test.sh
index b56dcbb436..0bd3db7d68 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -18,7 +18,7 @@ fi
 
 echo -n "" >${log}
 
-printf "%12s------- Unit tests -------\n" ""
+printf "%20s------- Unit tests -------\n" ""
 ${unit_tester} 2>>${log}
 if [ "${?}" != "0" ]; then
   trouble=1
@@ -27,9 +27,9 @@ fi
 
 echo
 
-printf "%12s------- Java tests -------\n" ""
+printf "%20s------- Java tests -------\n" ""
 for test in ${tests}; do
-  printf "%24s: " "${test}"
+  printf "%32s: " "${test}"
 
   case ${mode} in
     debug|debug-fast|fast|small )
diff --git a/unittest/test-harness.cpp b/unittest/test-harness.cpp
index 1c11c480a3..5092501861 100644
--- a/unittest/test-harness.cpp
+++ b/unittest/test-harness.cpp
@@ -32,7 +32,7 @@ Test::Test(const char* name):
 bool Test::runAll() {
   int failures = 0;
   for(Test* t = Test::first; t; t = t->next) {
-    printf("%24s: ", t->name);
+    printf("%32s: ", t->name);
     t->run();
     failures += t->failures;
     if(t->failures > 0) {
@@ -49,4 +49,4 @@ int main(int argc UNUSED, char** argv UNUSED) {
     return 0;
   }
   return 1;
-}
\ No newline at end of file
+}