ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-02 17:21:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #262 from dicej/ios

Browse Source 
fix iOS OpenJDK and simulator builds
This commit is contained in:
Joel Dice 2014-05-18 20:46:22 -06:00
commit 1396551433
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -687,9 +687,6 @@ ifeq ($(platform),darwin)
cxx = $(ios-bin)/g++ cxx = $(ios-bin)/g++
cc = $(ios-bin)/gcc cc = $(ios-bin)/gcc
endif endif
ar = $(ios-bin)/ar
ranlib = $(ios-bin)/ranlib
strip = $(ios-bin)/strip
flags = -isysroot $(sdk-dir)/$(target)$(ios-version).sdk \ flags = -isysroot $(sdk-dir)/$(target)$(ios-version).sdk \
$(arch-flag) $(arch-flag)
@ -1342,7 +1339,8 @@ ifneq ($(classpath),avian)
$(classpath-src)/avian/VMClass.java \ $(classpath-src)/avian/VMClass.java \
$(classpath-src)/avian/VMField.java \ $(classpath-src)/avian/VMField.java \
$(classpath-src)/avian/VMMethod.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),) ifeq ($(openjdk),)
classpath-sources := $(classpath-sources) \ classpath-sources := $(classpath-sources) \

3
openjdk.pro
View File

@ -237,6 +237,9 @@
# loaded reflectively to handle embedded resources: # loaded reflectively to handle embedded resources:
-keep class avian.avianvmresource.Handler -keep class avian.avianvmresource.Handler
# loaded reflectively by sun.misc.Launcher:
-keep class avian.file.Handler
# refered to symbolically in MethodAccessorGenerator: # refered to symbolically in MethodAccessorGenerator:
-keep class sun.reflect.MethodAccessorImpl { -keep class sun.reflect.MethodAccessorImpl {
<methods>; <methods>;