wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 961598 - Part 2: Disable wrapped code from ICS. r=mwu, mh

Browse Source
This commit is contained in:
John Shih 2014-02-25 09:46:48 +08:00
parent 1dba42f7f1
commit 39655cb516
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -6962,7 +6962,7 @@ dnl our own linker.
if test "$OS_TARGET" = Android; then
WRAP_LDFLAGS="${WRAP_LDFLAGS} -L$_objdir/dist/lib -lmozglue"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=PR_GetEnv,--wrap=PR_SetEnv"
if test -z "$gonkdir" -o "$ANDROID_VERSION" -le 18; then
if test "$MOZ_WIDGET_TOOLKIT" = android; then
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror"
fi
if test -z "$gonkdir"; then

5
moz.build
View File

@ -25,9 +25,8 @@ if not CONFIG['LIBXUL_SDK']:
add_tier_dir('base', ['mfbt'])
if not CONFIG['JS_STANDALONE']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] <= '18':
add_tier_dir('base', ['other-licenses/android'])
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
add_tier_dir('base', ['other-licenses/android'])
if CONFIG['MOZ_MEMORY']:
add_tier_dir('base', ['memory'])