Skip to content

Commit a1a886d

Browse files
cscd98cscd98
committed
smb: change android to use griffin build of libsmb2
1 parent 687c241 commit a1a886d

File tree

2 files changed

+78
-73
lines changed

2 files changed

+78
-73
lines changed

‎griffin/griffin.c‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,6 +1727,64 @@ GAME AI
17271727
/*============================================================
17281728
SMB CLIENT
17291729
============================================================ */
1730+
#ifdef HAVE_BUILTINSMBCLIENT
1731+
#include "../deps/libsmb2/lib/aes.c"
1732+
#include "../deps/libsmb2/lib/aes_apple.c"
1733+
#include "../deps/libsmb2/lib/aes128ccm.c"
1734+
#include "../deps/libsmb2/lib/asn1-ber.c"
1735+
#include "../deps/libsmb2/lib/aes_reference.c"
1736+
#include "../deps/libsmb2/lib/alloc.c"
1737+
#include "../deps/libsmb2/lib/compat.c"
1738+
#include "../deps/libsmb2/lib/dcerpc.c"
1739+
#include "../deps/libsmb2/lib/dcerpc-lsa.c"
1740+
#include "../deps/libsmb2/lib/dcerpc-srvsvc.c"
1741+
#include "../deps/libsmb2/lib/errors.c"
1742+
#include "../deps/libsmb2/lib/hmac.c"
1743+
#include "../deps/libsmb2/lib/hmac-md5.c"
1744+
#include "../deps/libsmb2/lib/init.c"
1745+
#include "../deps/libsmb2/lib/krb5-wrapper.c"
1746+
#include "../deps/libsmb2/lib/libsmb2.c"
1747+
#include "../deps/libsmb2/lib/md4c.c"
1748+
#include "../deps/libsmb2/lib/md5.c"
1749+
#include "../deps/libsmb2/lib/ntlmssp.c"
1750+
#include "../deps/libsmb2/lib/pdu.c"
1751+
#include "../deps/libsmb2/lib/sha1.c"
1752+
#include "../deps/libsmb2/lib/sha224-256.c"
1753+
#include "../deps/libsmb2/lib/sha384-512.c"
1754+
#include "../deps/libsmb2/lib/smb2-cmd-close.c"
1755+
#include "../deps/libsmb2/lib/smb2-cmd-create.c"
1756+
#include "../deps/libsmb2/lib/smb2-cmd-echo.c"
1757+
#include "../deps/libsmb2/lib/smb2-cmd-error.c"
1758+
#include "../deps/libsmb2/lib/smb2-cmd-flush.c"
1759+
#include "../deps/libsmb2/lib/smb2-cmd-ioctl.c"
1760+
#include "../deps/libsmb2/lib/smb2-cmd-lock.c"
1761+
#include "../deps/libsmb2/lib/smb2-cmd-logoff.c"
1762+
#include "../deps/libsmb2/lib/smb2-cmd-negotiate.c"
1763+
#include "../deps/libsmb2/lib/smb2-cmd-oplock-break.c"
1764+
#include "../deps/libsmb2/lib/smb2-cmd-notify-change.c"
1765+
#include "../deps/libsmb2/lib/smb2-cmd-query-directory.c"
1766+
#include "../deps/libsmb2/lib/smb2-cmd-query-info.c"
1767+
#include "../deps/libsmb2/lib/smb2-cmd-read.c"
1768+
#include "../deps/libsmb2/lib/smb2-cmd-session-setup.c"
1769+
#include "../deps/libsmb2/lib/smb2-cmd-set-info.c"
1770+
#include "../deps/libsmb2/lib/smb2-cmd-tree-connect.c"
1771+
#include "../deps/libsmb2/lib/smb2-cmd-tree-disconnect.c"
1772+
#include "../deps/libsmb2/lib/smb2-cmd-write.c"
1773+
#include "../deps/libsmb2/lib/smb2-data-file-info.c"
1774+
#include "../deps/libsmb2/lib/smb2-data-filesystem-info.c"
1775+
#include "../deps/libsmb2/lib/smb2-data-security-descriptor.c"
1776+
#include "../deps/libsmb2/lib/smb2-data-reparse-point.c"
1777+
#include "../deps/libsmb2/lib/smb2-share-enum.c"
1778+
#include "../deps/libsmb2/lib/smb2-signing.c"
1779+
#include "../deps/libsmb2/lib/smb3-seal.c"
1780+
#include "../deps/libsmb2/lib/socket.c"
1781+
#include "../deps/libsmb2/lib/spnego-wrapper.c"
1782+
#include "../deps/libsmb2/lib/sync.c"
1783+
#include "../deps/libsmb2/lib/timestamps.c"
1784+
#include "../deps/libsmb2/lib/usha.c"
1785+
#include "../deps/libsmb2/lib/unicode.c"
1786+
#endif
1787+
17301788
#ifdef HAVE_SMBCLIENT
17311789
#include "../libretro-common/vfs/vfs_implementation_smb.c"
17321790
#endif

‎pkg/android/phoenix-common/jni/Android.mk‎

Lines changed: 20 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ LOCAL_MODULE := retroarch-activity
5959
LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin.c \
6060
$(RARCH_DIR)/griffin/griffin_cpp.cpp
6161

62+
ifeq ($(HAVE_BUILTINSMBCLIENT),1)
63+
DEFINES += -DHAVE_BUILTINSMBCLIENT
64+
DEFINES += "-D_U_=__attribute__((unused))"
65+
DEFINES += -DHAVE_TIME_H -DHAVE_FCNTL_H -DHAVE_UNISTD_H
66+
DEFINES += -DHAVE_STDLIB_H -DSTDC_HEADERS
67+
DEFINES += -DHAVE_STRING_H
68+
DEFINES += -DHAVE_LINGER
69+
DEFINES += -DHAVE_SYS_UIO_H
70+
DEFINES += -DHAVE_POLL_H -DHAVE_NETDB_H
71+
DEFINES += -DHAVE_NETINET_TCP_H -DHAVE_NETINET_IN_H
72+
DEFINES += -DHAVE_SYS_SOCKET_H -DHAVE_ARPA_INET_H
73+
DEFINES += -DHAVE_SMBCLIENT
74+
endif
75+
6276
ifeq ($(HAVE_LOGGER), 1)
6377
DEFINES += -DHAVE_LOGGER
6478
endif
@@ -204,6 +218,12 @@ ifeq ($(HAVE_CHEEVOS),1)
204218
INCLUDE_DIRS += -I$(LOCAL_PATH)/$(DEPS_DIR)/rcheevos/include
205219
endif
206220

221+
ifeq ($(HAVE_BUILTINSMBCLIENT),1)
222+
INCLUDE_DIRS += \
223+
-I$(LOCAL_PATH)/$(DEPS_DIR)/libsmb2/include \
224+
-I$(LOCAL_PATH)/$(DEPS_DIR)/libsmb2/include/smb2
225+
endif
226+
207227
LOCAL_CFLAGS += $(INCLUDE_DIRS)
208228
LOCAL_CPPFLAGS += $(INCLUDE_DIRS)
209229
LOCAL_CXXFLAGS += $(INCLUDE_DIRS)
@@ -222,79 +242,6 @@ LOCAL_CFLAGS += -Wno-sign-compare -Wno-unused-variable -Wno-parentheses
222242
LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin_glslang.cpp
223243
endif
224244

225-
ifeq ($(HAVE_BUILTINSMBCLIENT),1)
226-
LOCAL_CFLAGS += "-D_U_=__attribute__((unused))"
227-
LOCAL_CFLAGS += -DHAVE_TIME_H -DHAVE_FCNTL_H -DHAVE_UNISTD_H
228-
LOCAL_CFLAGS += -DHAVE_STDLIB_H -DSTDC_HEADERS
229-
LOCAL_CFLAGS += -DHAVE_STRING_H
230-
LOCAL_CFLAGS += -DHAVE_LINGER
231-
LOCAL_CFLAGS += -DHAVE_SYS_UIO_H
232-
LOCAL_CFLAGS += -DHAVE_POLL_H -DHAVE_NETDB_H
233-
LOCAL_CFLAGS += -DHAVE_NETINET_TCP_H -DHAVE_NETINET_IN_H
234-
LOCAL_CFLAGS += -DHAVE_SYS_SOCKET_H -DHAVE_ARPA_INET_H
235-
236-
LOCAL_SRC_FILES += \
237-
$(DEPS_DIR)/libsmb2/lib/aes.c \
238-
$(DEPS_DIR)/libsmb2/lib/aes_apple.c \
239-
$(DEPS_DIR)/libsmb2/lib/aes128ccm.c \
240-
$(DEPS_DIR)/libsmb2/lib/asn1-ber.c \
241-
$(DEPS_DIR)/libsmb2/lib/aes_reference.c \
242-
$(DEPS_DIR)/libsmb2/lib/alloc.c \
243-
$(DEPS_DIR)/libsmb2/lib/compat.c \
244-
$(DEPS_DIR)/libsmb2/lib/dcerpc.c \
245-
$(DEPS_DIR)/libsmb2/lib/dcerpc-lsa.c \
246-
$(DEPS_DIR)/libsmb2/lib/dcerpc-srvsvc.c \
247-
$(DEPS_DIR)/libsmb2/lib/errors.c \
248-
$(DEPS_DIR)/libsmb2/lib/hmac.c \
249-
$(DEPS_DIR)/libsmb2/lib/hmac-md5.c \
250-
$(DEPS_DIR)/libsmb2/lib/init.c \
251-
$(DEPS_DIR)/libsmb2/lib/krb5-wrapper.c \
252-
$(DEPS_DIR)/libsmb2/lib/libsmb2.c \
253-
$(DEPS_DIR)/libsmb2/lib/md4c.c \
254-
$(DEPS_DIR)/libsmb2/lib/md5.c \
255-
$(DEPS_DIR)/libsmb2/lib/ntlmssp.c \
256-
$(DEPS_DIR)/libsmb2/lib/pdu.c \
257-
$(DEPS_DIR)/libsmb2/lib/sha1.c \
258-
$(DEPS_DIR)/libsmb2/lib/sha224-256.c \
259-
$(DEPS_DIR)/libsmb2/lib/sha384-512.c \
260-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-close.c \
261-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-create.c \
262-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-echo.c \
263-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-error.c \
264-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-flush.c \
265-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-ioctl.c \
266-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-lock.c \
267-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-logoff.c \
268-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-negotiate.c \
269-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-oplock-break.c \
270-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-notify-change.c \
271-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-query-directory.c \
272-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-query-info.c \
273-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-read.c \
274-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-session-setup.c \
275-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-set-info.c \
276-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-tree-connect.c \
277-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-tree-disconnect.c \
278-
$(DEPS_DIR)/libsmb2/lib/smb2-cmd-write.c \
279-
$(DEPS_DIR)/libsmb2/lib/smb2-data-file-info.c \
280-
$(DEPS_DIR)/libsmb2/lib/smb2-data-filesystem-info.c \
281-
$(DEPS_DIR)/libsmb2/lib/smb2-data-security-descriptor.c \
282-
$(DEPS_DIR)/libsmb2/lib/smb2-data-reparse-point.c \
283-
$(DEPS_DIR)/libsmb2/lib/smb2-share-enum.c \
284-
$(DEPS_DIR)/libsmb2/lib/smb2-signing.c \
285-
$(DEPS_DIR)/libsmb2/lib/smb3-seal.c \
286-
$(DEPS_DIR)/libsmb2/lib/socket.c \
287-
$(DEPS_DIR)/libsmb2/lib/spnego-wrapper.c \
288-
$(DEPS_DIR)/libsmb2/lib/sync.c \
289-
$(DEPS_DIR)/libsmb2/lib/timestamps.c \
290-
$(DEPS_DIR)/libsmb2/lib/usha.c \
291-
$(DEPS_DIR)/libsmb2/lib/unicode.c
292-
293-
LOCAL_C_INCLUDES += \
294-
$(LOCAL_PATH)/$(DEPS_DIR)/libsmb2/include \
295-
$(LOCAL_PATH)/$(DEPS_DIR)/libsmb2/include/smb2
296-
endif
297-
298245
LOCAL_LDLIBS += -lOpenSLES -lz
299246

300247
ifneq ($(SANITIZER),)

0 commit comments

Comments
 (0)