Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2ddd am: 938173f0be am: 2c6183e4d4 am: ba0a34c287 am: 692d7d15b3 am: fb586c8717
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523
Change-Id: Ifdab1f82a22ae0dac5adf0bd477e4497b0f5954d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 7400a27..c38ede4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,6 +74,11 @@
"-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>