Merge pull request #25 from Shao-Feng/PIE

Update travis script for building both PIE and non_PIE binary

Author: Shao-Feng

.travis.yml

@@ -43,13 +43,31 @@ before_script:
   # build for android
   - cd ../tools 
   - ./install_android_ndk.sh
+
+  ## build PIE binary
   - cd ../android/jni/
+  - cp ./Android_PIE.mk ./Android.mk
+  - ../../android-ndk/ndk-build clean
+  - rm -rf ../libs/*
   - ../../android-ndk/ndk-build
   - cd ../ 
   # build apk
   - gradlew build --stacktrace
-  - cp -r build/outputs/apk ../dest/android/
+  - cp -r build/outputs/apk ../dest/android_PIE/
   - cd .. 
+
+  ## build non-PIE binary
+  - cd ./android/jni/
+  - cp ./Android_non_PIE.mk ./Android.mk
+  - ../../android-ndk/ndk-build clean
+  - rm -rf ../libs/*
+  - ../../android-ndk/ndk-build
+  - cd ../ 
+  # build apk
+  - gradlew build --stacktrace
+  - cp -r build/outputs/apk ../dest/android_non_PIE/
+  - cd ..
+
 script: 
   - tree dest/ 
   - tar -cvzf testkit-stub.tar.gz ./dest/

android/jni/Android.mk android/jni/Android_PIE.mkandroid/jni/Android.mk renamed to android/jni/Android_PIE.mk

@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS += -fexceptions -frtti
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../include
+LOCAL_LDLIBS := -llog
+LOCAL_MODULE := testkit-stub
+LOCAL_STATIC_LIBRARIES += $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/4.8/libs/$(TARGET_ARCH_ABI)/libsupc++.a
+LOCAL_STATIC_LIBRARIES += $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/4.8/libs/$(TARGET_ARCH_ABI)/libgnustl_static.a
+LOCAL_SRC_FILES := ../../source/comfun.cpp ../../source/httpserver.cpp ../../source/testcase.cpp ../../source/main/main.cpp ../../source/json/json_reader.cpp ../../source/json/json_value.cpp ../../source/json/json_writer.cpp
+include $(BUILD_EXECUTABLE)