Bug 1624450 - Remove CHECK_FORK_GETPID from Android NSS compilation r=glandium

CHECK_FORK_GETPID was useful back when Android didn't support pthread_atfork, which it has since at least ICS (API 14 or 15), and Fennec has required API 16 for a while now.

Moreover, softoken.h also defines CHECK_FORK_PTHREAD on its own, and pkcs11.c initialization code prioritizes CHECK_FORK_PTHREAD, while the finalization code prioritizes CHECK_FORK_GETPID, such that reinitialization was never possible.

Differential Revision: https://phabricator.services.mozilla.com/D67940
This commit is contained in:
Kevin Jacobs 2020-04-21 03:03:58 +00:00
Родитель 84731cd82b
Коммит 7aef8cc570
1 изменённых файлов: 0 добавлений и 2 удалений

Просмотреть файл

@ -141,8 +141,6 @@ if CONFIG['OS_TARGET'] == 'WINNT':
if CONFIG['OS_TARGET'] == 'Android': if CONFIG['OS_TARGET'] == 'Android':
sandbox_vars['CFLAGS'] = [ sandbox_vars['CFLAGS'] = [
'-include', TOPSRCDIR + '/security/manager/android_stub.h', '-include', TOPSRCDIR + '/security/manager/android_stub.h',
# Setting sandbox_vars['DEFINES'] is broken currently.
'-DCHECK_FORK_GETPID',
] ]
if CONFIG['ANDROID_VERSION']: if CONFIG['ANDROID_VERSION']:
sandbox_vars['CFLAGS'] += ['-DANDROID_VERSION=' + CONFIG['ANDROID_VERSION']] sandbox_vars['CFLAGS'] += ['-DANDROID_VERSION=' + CONFIG['ANDROID_VERSION']]