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 { ;