Skip to content

Commit

Permalink
Update expat native library to 2.2.9 (#1214)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattleibow authored Apr 7, 2020
1 parent 58a9a7b commit 3d29c07
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion externals/skia
Submodule skia updated 1 files
+1 −1 DEPS
2 changes: 1 addition & 1 deletion native/android/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Task("libSkiaSharp")
$"target_os='android' target_cpu='{skiaArch}' " +
$"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " +
$"skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " +
$"extra_cflags=[ '-DSKIA_C_DLL' ] " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM' ] " +
$"ndk='{ANDROID_NDK_HOME}' " +
$"ndk_api={(skiaArch == "x64" || skiaArch == "arm64" ? 21 : 16)}");

Expand Down
2 changes: 1 addition & 1 deletion native/ios/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Task("libSkiaSharp")
$"target_os='ios' target_cpu='{skiaArch}' " +
$"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " +
$"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-mios-version-min=8.0' ] " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mios-version-min=8.0' ] " +
$"extra_ldflags=[ '-Wl,ios_version_min=8.0' ]");

RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch);
Expand Down
2 changes: 1 addition & 1 deletion native/linux/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Task("libSkiaSharp")
$"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " +
$"skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " +
$"skia_enable_gpu={(SUPPORT_GPU ? "true" : "false")} " +
$"extra_cflags=[ '-DSKIA_C_DLL' ] " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM' ] " +
$"extra_ldflags=[ '-static-libstdc++', '-static-libgcc', '-Wl,--version-script={map}' ] " +
compilers +
$"linux_soname_version='{soname}' " +
Expand Down
2 changes: 1 addition & 1 deletion native/macos/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Task("libSkiaSharp")
$"target_os='mac' target_cpu='{skiaArch}' " +
$"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " +
$"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-mmacosx-version-min=10.7', '-stdlib=libc++' ] " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mmacosx-version-min=10.7', '-stdlib=libc++' ] " +
$"extra_ldflags=[ '-Wl,macosx_version_min=10.7', '-stdlib=libc++' ]");

RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", "macosx", arch);
Expand Down
2 changes: 1 addition & 1 deletion native/tizen/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Task("libSkiaSharp")
$"skia_use_system_libpng=false " +
$"skia_use_system_libwebp=false " +
$"skia_use_system_zlib=true " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-DSK_BUILD_FOR_TIZEN' ] " +
$"extra_cflags=[ '-DSKIA_C_DLL', '-DSK_BUILD_FOR_TIZEN', '-DXML_DEV_URANDOM' ] " +
$"ncli='{TIZEN_STUDIO_HOME}' " +
$"ncli_version='4.0'");

Expand Down
2 changes: 1 addition & 1 deletion native/tvos/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Task("libSkiaSharp")
$"target_os='tvos' target_cpu='{skiaArch}' " +
$"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " +
$"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " +
$"extra_cflags=[ '-DSK_BUILD_FOR_TVOS', '-DSKIA_C_DLL', '-mtvos-version-min=9.0' ] " +
$"extra_cflags=[ '-DSK_BUILD_FOR_TVOS', '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mtvos-version-min=9.0' ] " +
$"extra_ldflags=[ '-Wl,tvos_version_min=9.0' ]");

RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch);
Expand Down
2 changes: 1 addition & 1 deletion native/watchos/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Task("libSkiaSharp")
$"skia_enable_gpu=false " +
$"skia_use_icu=false skia_use_sfntly=false skia_use_piex=true " +
$"skia_use_system_expat=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false " +
$"extra_cflags=[ '-DSK_BUILD_FOR_WATCHOS', '-DSKIA_C_DLL', '-mwatchos-version-min=2.0' ] " +
$"extra_cflags=[ '-DSK_BUILD_FOR_WATCHOS', '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-mwatchos-version-min=2.0' ] " +
$"extra_ldflags=[ '-Wl,watchos_version_min=2.0' ]");

RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch);
Expand Down

0 comments on commit 3d29c07

Please sign in to comment.