From 39242b69cdf9db51373d11fcb31e3729884e5ed6 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Wed, 6 Dec 2017 15:15:33 -0800
Subject: [PATCH] Refine build script for overture

---
 .gitignore                   |  6 ------
 core/src/main/jni/Android.mk | 11 -----------
 core/src/overture/clean.bash |  2 --
 core/src/overture/make.bash  |  2 +-
 mobile/build.gradle          |  2 +-
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 352b8f78..678f33aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,8 @@ captures/
 release/
 
 .idea/
-.d
-gen/
 *.iml
 
-core/src/main/libs
-core/src/main/obj
-core/src/main/jni/overture
-
 core/src/overture/.deps
 core/src/overture/bin
 core/src/overture/pkg
diff --git a/core/src/main/jni/Android.mk b/core/src/main/jni/Android.mk
index 0d19b088..58d9ef75 100755
--- a/core/src/main/jni/Android.mk
+++ b/core/src/main/jni/Android.mk
@@ -476,17 +476,6 @@ LOCAL_SRC_FILES := $(addprefix pcre/, $(libpcre_src_files))
 
 include $(BUILD_STATIC_LIBRARY)
 
-########################################################
-## overture
-########################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := overture
-LOCAL_SRC_FILES := overture/$(TARGET_ARCH_ABI)/liboverture.so
-
-include $(PREBUILT_SHARED_LIBRARY)
-
 # Import cpufeatures
 $(call import-module,android/cpufeatures)
 
diff --git a/core/src/overture/clean.bash b/core/src/overture/clean.bash
index b75dc943..874525aa 100755
--- a/core/src/overture/clean.bash
+++ b/core/src/overture/clean.bash
@@ -1,12 +1,10 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-TARGET=$DIR/../main/jni/overture
 DEPS=$DIR/.deps
 
 rm -rf $DEPS
 rm -rf $DIR/go/bin
 rm -rf $DIR/bin
-rm -rf $TARGET
 
 echo "Successfully clean overture"
diff --git a/core/src/overture/make.bash b/core/src/overture/make.bash
index 7310a61a..04edca58 100755
--- a/core/src/overture/make.bash
+++ b/core/src/overture/make.bash
@@ -8,7 +8,7 @@ function try () {
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 MIN_API=$1
-TARGET=$DIR/../main/jni/overture
+TARGET=$DIR/bin
 DEPS=$DIR/.deps
 
 ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-arm
diff --git a/mobile/build.gradle b/mobile/build.gradle
index bf7ea708..0183dafe 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -54,7 +54,7 @@ android {
     }
     sourceSets.main.jniLibs.srcDirs +=
             new File(project(':core').buildDir, "intermediates/bundles/${getCurrentFlavor()}/jni")
-    sourceSets.main.jniLibs.srcDirs += new File(project(':core').projectDir, "src/main/jni/overture")
+    sourceSets.main.jniLibs.srcDirs += new File(project(':core').projectDir, "src/overture/bin")
 }
 
 dependencies {