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 794510, Part 9: remove security/nss/cmd/** includes from mozglue; r=glandium

Browse Source
This commit is contained in:
Brian Smith 2012-10-19 10:59:15 -04:00
parent 80fe7b4291
commit bcc1ba760b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozglue/android/Makefile.in
View File

@ -40,7 +40,6 @@ LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/nss
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/util LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/util
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/softoken LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/softoken
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/pk11wrap LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/pk11wrap
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/cmd/ecperf
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/pkcs7 LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/pkcs7
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/certdb LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/certdb
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/cryptohi LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/cryptohi
@ -50,7 +49,6 @@ LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/pki
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/smime LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/smime
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/freebl/ LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/freebl/
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/ssl LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/lib/ssl
LOCAL_INCLUDES += -I$(topsrcdir)/security/nss/cmd/lib/
ifdef MOZ_OLD_LINKER ifdef MOZ_OLD_LINKER
DEFINES += -DMOZ_OLD_LINKER DEFINES += -DMOZ_OLD_LINKER

12
mozglue/android/NSSBridge.h
View File

@ -6,10 +6,16 @@
#define NSSBridge_h #define NSSBridge_h
#include "nss.h" #include "nss.h"
#include "seccomon.h"
#include "secmodt.h"
#include "secutil.h"
#include "pk11func.h" #include "pk11func.h"
#include "pk11sdr.h"
#include "seccomon.h"
#include "secitem.h"
#include "secmodt.h"
#include "prerror.h"
#include "plstr.h"
#include "prmem.h"
#include <jni.h> #include <jni.h>
int setup_nss_functions(void *nss_handle, void *nssutil_handle, void *plc_handle); int setup_nss_functions(void *nss_handle, void *nssutil_handle, void *plc_handle);