Merge pull request #17 from Shao-Feng/non-pie

Update the travis script for building both PIE and non-PIE binary

Author: Shao-Feng

.travis.yml

@@ -34,20 +34,46 @@ before_script:
 #build android ndk binary
 - cd ../tools
 - ./install_android_ndk.sh
+
+## build PIE binary
 - cd ../android/native/jni/
+- cp ./Android_PIE.mk ./Android.mk
+- ../../../android-ndk/ndk-build clean
+- rm -rf ../libs/*
 - ../../../android-ndk/ndk-build
 - cd ../../
+- rm -rf ./assets/system/*
 - cp -r ./native/libs ./assets/system/ 
 
-#copy busybox dest
+## copy busybox dest
 - cp -r ../tools/busybox_dest/libs ./assets/system/
 
 - 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/native/jni/
+- cp ./Android_non_PIE.mk ./Android.mk
+- ../../../android-ndk/ndk-build clean
+- rm -rf ../libs/*
+- ../../../android-ndk/ndk-build
+- cd ../../
+- rm -rf ./assets/system/*
+- cp -r ./native/libs ./assets/system/ 
+
+## copy busybox dest
+- cp -r ../tools/busybox_dest/libs ./assets/system/
+
+- gradlew build --stacktrace
+- cp -r build/outputs/apk ../dest/android_non_PIE/
+- cd ..
+
 script:
 - tree dest/
 - tar -cvzf tinyweb.tar.gz ./dest/
+
 deploy:
   provider: releases
   skip_cleanup: true

android/native/jni/Android_PIE.mk

@@ -0,0 +1,30 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS += -pie -fPIE
+LOCAL_LDFLAGS += -pie -fPIE
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../..
+LOCAL_MODULE := cgi-getfield
+LOCAL_SRC_FILES := ../../../cgi-getfield.c
+include $(BUILD_EXECUTABLE)
+
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS += -pie -fPIE
+LOCAL_LDFLAGS += -pie -fPIE
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../..
+LOCAL_MODULE := cgi-getcookie
+LOCAL_SRC_FILES := ../../../cgi-getcookie.c
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS := -DUSE_WEBSOCKET
+LOCAL_CFLAGS += -pie -fPIE
+LOCAL_LDFLAGS += -pie -fPIE
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../..
+LOCAL_MODULE := tinyweb
+LOCAL_SRC_FILES := ../../../websocket.c ../../../mongoose.c ../../../tinyweb.c
+include $(BUILD_EXECUTABLE)
+
+
+

android/native/jni/Android_non_PIE.mk

@@ -0,0 +1,24 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../..
+LOCAL_MODULE := cgi-getfield
+LOCAL_SRC_FILES := ../../../cgi-getfield.c
+include $(BUILD_EXECUTABLE)
+
+
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../..
+LOCAL_MODULE := cgi-getcookie
+LOCAL_SRC_FILES := ../../../cgi-getcookie.c
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS := -DUSE_WEBSOCKET
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../..
+LOCAL_MODULE := tinyweb
+LOCAL_SRC_FILES := ../../../websocket.c ../../../mongoose.c ../../../tinyweb.c
+include $(BUILD_EXECUTABLE)
+
+
+