From f3669ce85ac8bf0c2ae7e563f1d6887d99fe97b3 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 17 Aug 2017 20:06:47 +0100
Subject: [PATCH] updated Android makefiles

---
 .../bootstraps/lbry/__init__.py               |  2 +-
 .../bootstraps/lbry/build/build.gradle        | 21 -------------------
 .../bootstraps/lbry/build/gradle.properties   | 21 -------------------
 .../bootstraps/lbry/build/jni/src/Android.mk  |  6 +-----
 .../lbry/build/jni/src/Android_static.mk      |  2 --
 5 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 p4a/pythonforandroid/bootstraps/lbry/build/build.gradle
 delete mode 100644 p4a/pythonforandroid/bootstraps/lbry/build/gradle.properties

diff --git a/p4a/pythonforandroid/bootstraps/lbry/__init__.py b/p4a/pythonforandroid/bootstraps/lbry/__init__.py
index d814ca50..c16640fd 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/__init__.py
+++ b/p4a/pythonforandroid/bootstraps/lbry/__init__.py
@@ -13,7 +13,7 @@ class LbryBootstrap(Bootstrap):
         info_main('# Creating Android project from build and {} bootstrap'.format(
             self.name))
 
-        info('This currently just copies the SDL2 build stuff straight from the build dir.')
+        info('This currently just copies the build stuff straight from the build dir.')
         shprint(sh.rm, '-rf', self.dist_dir)
         shprint(sh.cp, '-r', self.build_dir, self.dist_dir)
         with current_directory(self.dist_dir):
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/build.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/build.gradle
deleted file mode 100644
index f56187ae..00000000
--- a/p4a/pythonforandroid/bootstraps/lbry/build/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-allprojects {
-    repositories {
-        jcenter()
-    }
-}
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle-experimental:0.7.0"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/gradle.properties b/p4a/pythonforandroid/bootstraps/lbry/build/gradle.properties
deleted file mode 100644
index 24a89fbb..00000000
--- a/p4a/pythonforandroid/bootstraps/lbry/build/gradle.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-android.useDeprecatedNdk=true
-org.gradle.jvmargs=-Xmx4096M
\ No newline at end of file
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android.mk b/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android.mk
index 6a3e5293..018a7cad 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android.mk
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android.mk
@@ -4,12 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := main
 
-#SDL_PATH := ../SDL
-
-#LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
-
 # Add your application source files here...
-LOCAL_SRC_FILES := pyjniusjni.c start.c
+LOCAL_SRC_FILES := start.c pyjniusjni.c
 
 LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../other_builds/$(PYTHON2_NAME)/$(ARCH)/python2/python-install/include/python2.7 $(EXTRA_CFLAGS)
 
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android_static.mk b/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android_static.mk
index 0abf250f..2de278ee 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android_static.mk
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/jni/src/Android_static.mk
@@ -6,7 +6,5 @@ LOCAL_MODULE := main
 
 LOCAL_SRC_FILES := YourSourceHere.c
 
-#LOCAL_STATIC_LIBRARIES := SDL2_static
-
 include $(BUILD_SHARED_LIBRARY)
 $(call import-module,SDL)LOCAL_PATH := $(call my-dir)