Skip to content

Commit 969ecd3

Browse files
committed
Migration on gradle
1 parent 649796a commit 969ecd3

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

JniBitmapOperationsLibrary/build.gradle

+8-2
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,22 @@ android {
1414
resources.srcDirs = ['src']
1515
aidl.srcDirs = ['src']
1616
renderscript.srcDirs = ['src']
17-
jni.srcDirs = []
17+
jni.srcDirs = ['jni']
1818
}
1919
}
2020

2121
defaultConfig {
2222
ndk {
2323
moduleName "JniBitmapOperationsLibrary"
24-
ldLibs "log", "jnigraphics"
24+
ldLibs "log", "bitmap"
25+
cFlags "-DANDROID_NDK_HOME -ljnigraphics"
26+
stl "stlport_shared"
2527
}
2628
}
2729

30+
31+
32+
/*
2833
task buildNative(type: Exec, description: 'Compile JNI source via NDK') {
2934
def ndkDir = android.plugin.ndkFolder
3035
commandLine "$ndkDir/ndk-build",
@@ -46,4 +51,5 @@ android {
4651
tasks.withType(JavaCompile) {
4752
compileTask -> compileTask.dependsOn buildNative
4853
}
54+
*/
4955
}

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
mavenCentral()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:1.0.0'
12+
classpath 'com.android.tools.build:gradle:1.2.3'
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files
@@ -23,6 +23,6 @@ allprojects {
2323
}
2424

2525
ext {
26-
propBuildToolsVersion = '21.1.2'
27-
propCompileSdkVersion = 21
26+
propBuildToolsVersion = '22.0.1'
27+
propCompileSdkVersion = 22
2828
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jan 16 11:30:20 CET 2015
1+
#Wed May 13 00:33:24 EEST 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip

0 commit comments

Comments
 (0)