diff options
| author | A. Cody Schuffelen <schuffelen@google.com> | 2023-06-21 08:42:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-21 08:42:19 +0000 |
| commit | fb586c87176df9bd5db06df1f1bb82c2352d27ad (patch) | |
| tree | f5208f9de58e8c5fd86d0a61d217c398b6d9b86b | |
| parent | b3a3aa4b5412cdb0aff80e0d563d0036b909888f (diff) | |
| parent | 692d7d15b3936939b794ef5586d5b2c94e978706 (diff) | |
| download | ms-tpm-20-ref-fb586c87176df9bd5db06df1f1bb82c2352d27ad.tar.gz | |
Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2ddd am: 938173f0be am: 2c6183e4d4 am: ba0a34c287 am: 692d7d15b3
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523
Change-Id: Iffd7b88dd818570479ddcfc07bf843c1d0a5c941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | TPMCmd/Simulator/src/TPMCmdp.c | 2 | ||||
| -rw-r--r-- | TPMCmd/Simulator/src/TPMCmds.c | 2 | ||||
| -rw-r--r-- | TPMCmd/Simulator/src/TcpServer.c | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -74,6 +74,11 @@ cc_defaults { "-Wno-unused-parameter", "-Wno-typedef-redefinition", ], + target: { + darwin: { + enabled: true, + }, + }, } cc_library_static { diff --git a/TPMCmd/Simulator/src/TPMCmdp.c b/TPMCmd/Simulator/src/TPMCmdp.c index 6e5c22b..fb93b24 100644 --- a/TPMCmd/Simulator/src/TPMCmdp.c +++ b/TPMCmd/Simulator/src/TPMCmdp.c @@ -48,7 +48,7 @@ # include <windows.h>
# include <winsock.h>
# pragma warning(pop)
-#elif defined(__unix__)
+#elif defined(__unix__) || __APPLE__
# include "BaseTypes.h" // on behalf of TpmFail_fp.h
typedef int SOCKET;
#else
diff --git a/TPMCmd/Simulator/src/TPMCmds.c b/TPMCmd/Simulator/src/TPMCmds.c index ade1c23..9a88af4 100644 --- a/TPMCmd/Simulator/src/TPMCmds.c +++ b/TPMCmd/Simulator/src/TPMCmds.c @@ -50,7 +50,7 @@ # include <windows.h>
# include <winsock.h>
# pragma warning(pop)
-#elif defined(__unix__)
+#elif defined(__unix__) || __APPLE__
# define _strcmpi strcasecmp
typedef int SOCKET;
#else
diff --git a/TPMCmd/Simulator/src/TcpServer.c b/TPMCmd/Simulator/src/TcpServer.c index 5adb90a..b57475d 100644 --- a/TPMCmd/Simulator/src/TcpServer.c +++ b/TPMCmd/Simulator/src/TcpServer.c @@ -48,7 +48,7 @@ # include <winsock.h>
# pragma warning(pop)
typedef int socklen_t;
-#elif defined(__unix__)
+#elif defined(__unix__) || __APPLE__
# include <string.h>
# include <unistd.h>
# include <errno.h>
|