Merge remote-tracking branch 'origin/master' into android-upgrade

This commit is contained in:
Joel Dice 2014-09-29 11:11:06 -06:00
commit dec3d39d2e

View File

@ -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) \