mirror of
https://github.com/corda/corda.git
synced 2025-01-06 05:04:20 +00:00
Merge remote-tracking branch 'origin/master' into android-upgrade
This commit is contained in:
commit
dec3d39d2e
2
makefile
2
makefile
@ -1896,7 +1896,7 @@ $(build)/%-build.o: $(lzma)/C/%.c
|
||||
$(build-cc) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(lzma-build-cflags) \
|
||||
-c $(<) -o $(@)
|
||||
|
||||
$(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp
|
||||
$(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp $(vm-depends)
|
||||
$(compile-object)
|
||||
|
||||
$(static-library): $(vm-objects) $(classpath-objects) $(vm-heapwalk-objects) \
|
||||
|
Loading…
Reference in New Issue
Block a user