Skip to content

Commit d9d7e83

Browse files
committed
fix: Adjust to new jnigen array syntax
1 parent 7f56b5d commit d9d7e83

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

build.gradle.kts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ jnigen {
172172
val combined = name + "_" + arch
173173

174174
headerDirs += arrayOf("build/box2d/${combined}/include/")
175-
cFlags += " -std=c11 -fexceptions -DB2_ENABLE_ASSERT "
176-
cppFlags += " -std=c++11 -fexceptions -DB2_ENABLE_ASSERT "
175+
cFlags += arrayOf("-std=c11", "-fexceptions", "-DB2_ENABLE_ASSERT")
176+
cppFlags += arrayOf("-std=c++11", "-fexceptions", "-DB2_ENABLE_ASSERT")
177177
libraries += file("build/box2d/${combined}/libs/libbox2d.a").absolutePath
178178
}
179179

@@ -189,9 +189,12 @@ jnigen {
189189
addMac(x64, x86)
190190

191191
addAndroid {
192-
libraries = ""
193-
androidApplicationMk += "APP_PLATFORM := android-21\nAPP_STRIP_MODE := none\nAPP_STL := c++_shared"
194-
linkerFlags += " -stdlib=libc++\nLOCAL_WHOLE_STATIC_LIBRARIES := static_box2d"
192+
libraries = arrayOf()
193+
androidApplicationMk += arrayOf("APP_PLATFORM := android-21",
194+
"APP_STRIP_MODE := none",
195+
"APP_STL := c++_shared")
196+
linkerFlags += "-stdlib=libc++"
197+
androidAndroidMkSharedLibModule += "LOCAL_WHOLE_STATIC_LIBRARIES := static_box2d"
195198
androidAndroidMk += arrayOf(
196199
"include \$(CLEAR_VARS)",
197200
"LOCAL_MODULE := static_box2d",

0 commit comments

Comments
 (0)