Skip to content

Commit e056828

Browse files
committed
use CMakeList.txt in build.gradle
1 parent 39dc184 commit e056828

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

  • libs/openFrameworksCompiled/project/android/openframeworksAndroid

libs/openFrameworksCompiled/project/android/openframeworksAndroid/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,19 @@ android {
4545
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
4646

4747
externalNativeBuild {
48-
if (!project.hasProperty("ndkBuild")) {
48+
// if (!project.hasProperty("ndkBuild")) {
4949
cmake {
5050
arguments "-DANDROID_STL=c++_shared",
5151
"-DANDROID_ARM_NEON=TRUE",
5252
"-DANDROID_TOOLCHAIN=clang",
5353
"-DTARGET_OPENGLES=TRUE"
54+
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
5455
}
55-
} else {
56-
ndkBuild {
57-
58-
}
59-
}
56+
// } else {
57+
// ndkBuild {
58+
//
59+
// }
60+
// }
6061
}
6162
multiDexEnabled false
6263
}
@@ -89,15 +90,15 @@ android {
8990
}
9091
}
9192
externalNativeBuild {
92-
if (!project.hasProperty("ndkBuild")) {
93+
// if (!project.hasProperty("ndkBuild")) {
9394
cmake {
9495
path "CMakeLists.txt"
9596
}
96-
} else {
97-
ndkBuild {
98-
path "Android.mk"
99-
}
100-
}
97+
// } else {
98+
// ndkBuild {
99+
// path "Android.mk"
100+
// }
101+
// }
101102
}
102103
compileOptions {
103104
sourceCompatibility JavaVersion.VERSION_1_8

0 commit comments

Comments
 (0)