From d75c2131fb110dabaffb5506b3d1fff5da197ca0 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Sun, 18 May 2014 19:23:21 -0600
Subject: [PATCH] fix iOS OpenJDK and simulator builds

With the iOS openjdk-src build, sun.misc.Launcher will throw an
InternalError if avian.file.Handler is not present, so let's make it
happy.

Also, as of recent version(s) of Xcode, there are no utilities
(e.g. ar and strip) in iPhoneSimulator.platform/usr/bin, so we can
just use the system ones.
---
 makefile    | 6 ++----
 openjdk.pro | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/makefile b/makefile
index 12807a5a7f..0f768ac8fd 100755
--- a/makefile
+++ b/makefile
@@ -687,9 +687,6 @@ ifeq ($(platform),darwin)
 			cxx = $(ios-bin)/g++
 			cc = $(ios-bin)/gcc
 		endif
-		ar = $(ios-bin)/ar
-		ranlib = $(ios-bin)/ranlib
-		strip = $(ios-bin)/strip
 
 		flags = -isysroot $(sdk-dir)/$(target)$(ios-version).sdk \
 			$(arch-flag)
@@ -1342,7 +1339,8 @@ ifneq ($(classpath),avian)
 		$(classpath-src)/avian/VMClass.java \
 		$(classpath-src)/avian/VMField.java \
 		$(classpath-src)/avian/VMMethod.java \
-		$(classpath-src)/avian/avianvmresource/Handler.java
+		$(classpath-src)/avian/avianvmresource/Handler.java \
+		$(classpath-src)/avian/file/Handler.java
 
 	ifeq ($(openjdk),)
 		classpath-sources := $(classpath-sources) \
diff --git a/openjdk.pro b/openjdk.pro
index d3560dc7bb..14bb9f91f8 100644
--- a/openjdk.pro
+++ b/openjdk.pro
@@ -237,6 +237,9 @@
 # loaded reflectively to handle embedded resources:
 -keep class avian.avianvmresource.Handler
 
+# loaded reflectively by sun.misc.Launcher:
+-keep class avian.file.Handler
+
 # refered to symbolically in MethodAccessorGenerator:
 -keep class sun.reflect.MethodAccessorImpl {
    <methods>;