From 5fc5d37330d3535a0f421632694d1e7918fc22d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 11:38:09 +0200 Subject: Compiles correctly: app/build-native + gradle. --- app/jni/prebuilt.mk | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 app/jni/prebuilt.mk (limited to 'app/jni/prebuilt.mk') diff --git a/app/jni/prebuilt.mk b/app/jni/prebuilt.mk new file mode 100644 index 00000000..51bf1003 --- /dev/null +++ b/app/jni/prebuilt.mk @@ -0,0 +1,27 @@ +# Build curl + +include $(CLEAR_VARS) +LOCAL_MODULE := curl +LOCAL_SRC_FILES := prebuilt/libcurl.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +# SIGC + +include $(CLEAR_VARS) +LOCAL_MODULE := sigc +LOCAL_SRC_FILES := prebuilt/libsigc.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +include $(CLEAR_VARS) +# Torrent library +LOCAL_MODULE := rtorrent +LOCAL_SRC_FILES := prebuilt/librtorrent.a +LOCAL_PATH = $(CURRENT_DIR) + +LOCAL_STATIC_LIBRARIES := sigc + +include $(PREBUILT_STATIC_LIBRARY) -- cgit v1.2.3 From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 12:04:17 +0200 Subject: Rename app->bitmask_android This way, gradle commands generate apks correctly named. --- app/jni/prebuilt.mk | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 app/jni/prebuilt.mk (limited to 'app/jni/prebuilt.mk') diff --git a/app/jni/prebuilt.mk b/app/jni/prebuilt.mk deleted file mode 100644 index 51bf1003..00000000 --- a/app/jni/prebuilt.mk +++ /dev/null @@ -1,27 +0,0 @@ -# Build curl - -include $(CLEAR_VARS) -LOCAL_MODULE := curl -LOCAL_SRC_FILES := prebuilt/libcurl.a -LOCAL_PATH = $(CURRENT_DIR) - -include $(PREBUILT_STATIC_LIBRARY) - -# SIGC - -include $(CLEAR_VARS) -LOCAL_MODULE := sigc -LOCAL_SRC_FILES := prebuilt/libsigc.a -LOCAL_PATH = $(CURRENT_DIR) - -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Torrent library -LOCAL_MODULE := rtorrent -LOCAL_SRC_FILES := prebuilt/librtorrent.a -LOCAL_PATH = $(CURRENT_DIR) - -LOCAL_STATIC_LIBRARIES := sigc - -include $(PREBUILT_STATIC_LIBRARY) -- cgit v1.2.3 From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 9 Apr 2014 16:03:55 +0200 Subject: Back to the standard "app" module. This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure I'll have to tweak the final apk name in build.gradle. --- app/jni/prebuilt.mk | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 app/jni/prebuilt.mk (limited to 'app/jni/prebuilt.mk') diff --git a/app/jni/prebuilt.mk b/app/jni/prebuilt.mk new file mode 100644 index 00000000..51bf1003 --- /dev/null +++ b/app/jni/prebuilt.mk @@ -0,0 +1,27 @@ +# Build curl + +include $(CLEAR_VARS) +LOCAL_MODULE := curl +LOCAL_SRC_FILES := prebuilt/libcurl.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +# SIGC + +include $(CLEAR_VARS) +LOCAL_MODULE := sigc +LOCAL_SRC_FILES := prebuilt/libsigc.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +include $(CLEAR_VARS) +# Torrent library +LOCAL_MODULE := rtorrent +LOCAL_SRC_FILES := prebuilt/librtorrent.a +LOCAL_PATH = $(CURRENT_DIR) + +LOCAL_STATIC_LIBRARIES := sigc + +include $(PREBUILT_STATIC_LIBRARY) -- cgit v1.2.3