summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorSumant Tambe <sutambe@yahoo.com>2018-09-24 12:03:31 -0700
committerWouter van Oortmerssen <aardappel@gmail.com>2018-09-24 12:03:31 -0700
commit49fed8c4f61f296d1d173a1a8df872a094020278 (patch)
tree2bdba65b9733eeb2fbc8be3908c29cc2b3d3883a /android
parentb1a925dfc2ac78508aee89029e950057405f0a0a (diff)
downloadflatbuffers-49fed8c4f61f296d1d173a1a8df872a094020278.tar.gz
flatbuffers-49fed8c4f61f296d1d173a1a8df872a094020278.tar.bz2
flatbuffers-49fed8c4f61f296d1d173a1a8df872a094020278.zip
Add FlatBufferBuilder move semantics tests to the main test suite (#4902)
* Add FlatBufferBuilder move semantics tests to main Do not eagerly delete/reset allocators in release and release_raw functions Update android, vs2010 build files New tests for various types of FlatBufferBuilders and move semantics * Improve test failure output with function names
Diffstat (limited to 'android')
-rw-r--r--android/jni/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index aec561a9..b2203326 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -47,6 +47,10 @@ include $(CLEAR_VARS)
LOCAL_MODULE := FlatBufferTest
LOCAL_SRC_FILES := android/jni/main.cpp \
tests/test.cpp \
+ tests/test_assert.h \
+ tests/test_builder.h \
+ tests/test_assert.cpp \
+ tests/test_builder.cpp \
src/idl_gen_fbs.cpp \
src/idl_gen_general.cpp
LOCAL_LDLIBS := -llog -landroid -latomic