--- old/buildSrc/android.gradle 2017-10-20 15:03:51.508552022 -0700 +++ new/buildSrc/android.gradle 2017-10-20 15:03:51.340552027 -0700 @@ -351,7 +351,7 @@ "com/oracle/dalvik" ] -def text = (compileNativeText) ? "native" : "t2k" +def text = (compileNativeText) ? "native" : "" ANDROID.javafxPlatformProperties = """ javafx.platform=android @@ -566,20 +566,6 @@ ANDROID.font.linkFlags = [linkFlags].flatten() ANDROID.font.lib = "javafx_font" -if (BUILD_CLOSED) { - ANDROID.fontT2K = [:] - ANDROID.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"] - ANDROID.fontT2K.nativeSource = [ - file("$closedDir/javafx-font-t2k-native/src"), - file("$closedDir/javafx-font-t2k-native/src/layout")] - ANDROID.fontT2K.compiler = compiler - ANDROID.fontT2K.ccFlags = [ccFlags, "-DLE_STANDALONE", "-fno-exceptions", "-fno-rtti", ccWarnFlags, - ccArchFlags, ccOptFlags, ccDebugFlags, ccDefaultIncludeFlags].flatten() - ANDROID.fontT2K.linker = linker - ANDROID.fontT2K.linkFlags = [linkFlags, "-lstdc++"].flatten() - ANDROID.fontT2K.lib = "javafx_font_t2k" -} - if (compileNativeText) { ANDROID.fontNativeFreetype = [:] ANDROID.fontNativeFreetype.javahInclude = [