Commit 39242b69 authored by Mygod's avatar Mygod

Refine build script for overture

parent c79412fd
...@@ -7,14 +7,8 @@ captures/ ...@@ -7,14 +7,8 @@ captures/
release/ release/
.idea/ .idea/
.d
gen/
*.iml *.iml
core/src/main/libs
core/src/main/obj
core/src/main/jni/overture
core/src/overture/.deps core/src/overture/.deps
core/src/overture/bin core/src/overture/bin
core/src/overture/pkg core/src/overture/pkg
......
...@@ -476,17 +476,6 @@ LOCAL_SRC_FILES := $(addprefix pcre/, $(libpcre_src_files)) ...@@ -476,17 +476,6 @@ LOCAL_SRC_FILES := $(addprefix pcre/, $(libpcre_src_files))
include $(BUILD_STATIC_LIBRARY) 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 # Import cpufeatures
$(call import-module,android/cpufeatures) $(call import-module,android/cpufeatures)
#!/bin/bash #!/bin/bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
TARGET=$DIR/../main/jni/overture
DEPS=$DIR/.deps DEPS=$DIR/.deps
rm -rf $DEPS rm -rf $DEPS
rm -rf $DIR/go/bin rm -rf $DIR/go/bin
rm -rf $DIR/bin rm -rf $DIR/bin
rm -rf $TARGET
echo "Successfully clean overture" echo "Successfully clean overture"
...@@ -8,7 +8,7 @@ function try () { ...@@ -8,7 +8,7 @@ function try () {
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
MIN_API=$1 MIN_API=$1
TARGET=$DIR/../main/jni/overture TARGET=$DIR/bin
DEPS=$DIR/.deps DEPS=$DIR/.deps
ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-arm ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-arm
......
...@@ -54,7 +54,7 @@ android { ...@@ -54,7 +54,7 @@ android {
} }
sourceSets.main.jniLibs.srcDirs += sourceSets.main.jniLibs.srcDirs +=
new File(project(':core').buildDir, "intermediates/bundles/${getCurrentFlavor()}/jni") 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 { dependencies {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment