Skip to content

Commit d19670c

Browse files
wasabeefwasabeef
committed
Merge pull request cats-oss#137 from CyberAgent/develop
Adjustment to Jni, and Bug fix
2 parents fd22c6c + 21a3093 commit d19670c

File tree

13 files changed

+12
-242
lines changed

13 files changed

+12
-242
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
}
2020
2121
dependencies {
22-
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.2.0-SNAPSHOT'
22+
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.2.1-SNAPSHOT'
2323
}
2424
```
2525

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=1.2.0-SNAPSHOT
2-
VERSION_CODE=4
1+
VERSION_NAME=1.2.1-SNAPSHOT
2+
VERSION_CODE=5
33
GROUP=jp.co.cyberagent.android.gpuimage
44

55
COMPILE_SDK_VERSION=21

‎library/AndroidManifest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest
23
package="jp.co.cyberagent.android.gpuimage">
3-
4-
<application />
5-
64
</manifest>

‎library/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
ndk {
1616
moduleName "gpuimage-library"
1717
stl "gnustl_shared"
18-
abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
18+
abiFilters "all"
1919
ldLibs "log"
2020
}
2121
}
@@ -29,6 +29,7 @@ android {
2929
renderscript.srcDirs = ['src']
3030
res.srcDirs = ['res']
3131
assets.srcDirs = ['assets']
32+
jni.srcDirs = ['jni']
3233
}
3334

3435
instrumentTest.setRoot('tests')

‎library/jni/Android.mk

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎library/jni/Application.mk

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎library/pom.xml

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎library/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-21
1515
android.library=true

‎library/src/jp/co/cyberagent/android/gpuimage/GPUImageSourceOverBlendFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class GPUImageSourceOverBlendFilter extends GPUImageTwoInputFilter {
2626
" void main()\n" +
2727
" {\n" +
2828
" lowp vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);\n" +
29-
" lowp vec4 textureColor2 = texture2D(inputImageTexture2, textureCoordinate);\n" +
29+
" lowp vec4 textureColor2 = texture2D(inputImageTexture2, textureCoordinate2);\n" +
3030
" \n" +
3131
" gl_FragColor = mix(textureColor, textureColor2, textureColor2.a);\n" +
3232
" }";

‎pom.xml

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)