Enable Windows host compilation of ms-tpm-20-ref am: 35da877479 am: 83113fc5db am: 08ea96e8fe am: 55fc576843android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release

Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454

Change-Id: I7b6d72af132a84c11931a9012273b79a32361ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4 files changed, 23 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 355aaaf..7400a27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,7 +76,7 @@ cc_defaults {
     ],
 }
 
-cc_library {
+cc_library_static {
     name: "ms-tpm-20-ref-lib",
     srcs: [
         "TPMCmd/Platform/src/*.c",
@@ -100,6 +100,17 @@ cc_library {
         "TPMCmd/tpm/include/Ossl",
         "TPMCmd/tpm/include/prototypes",
     ],
+    target: {
+        windows: {
+            enabled: true,
+            cflags: [
+                "-Wno-unknown-pragmas",
+            ],
+            host_ldlibs: [
+                "-lws2_32",
+            ],
+        },
+    },
     defaults: [ "ms-tpm-20-ref-defaults" ],
 }
 
@@ -108,7 +119,7 @@ cc_binary_host {
     srcs: [
         "TPMCmd/Simulator/src/TPMCmds.c",
     ],
-    shared_libs: [
+    static_libs: [
         "ms-tpm-20-ref-lib",
     ],
     defaults: [ "ms-tpm-20-ref-defaults" ],
diff --git a/TPMCmd/Simulator/src/TPMCmdp.c b/TPMCmd/Simulator/src/TPMCmdp.c
index b776c59..6e5c22b 100644
--- a/TPMCmd/Simulator/src/TPMCmdp.c
+++ b/TPMCmd/Simulator/src/TPMCmdp.c
@@ -43,7 +43,7 @@
 #include <stdbool.h>

 #include "TpmBuildSwitches.h"

 

-#ifdef _MSC_VER

+#ifdef _WIN32

 #   pragma warning(push, 3)

 #   include <windows.h>

 #   include <winsock.h>

diff --git a/TPMCmd/Simulator/src/TPMCmds.c b/TPMCmd/Simulator/src/TPMCmds.c
index 0aca528..ade1c23 100644
--- a/TPMCmd/Simulator/src/TPMCmds.c
+++ b/TPMCmd/Simulator/src/TPMCmds.c
@@ -45,7 +45,7 @@
 #include <ctype.h>

 #include <string.h>

 

-#ifdef _MSC_VER

+#ifdef _WIN32

 #   pragma warning(push, 3)

 #   include <windows.h>

 #   include <winsock.h>

diff --git a/TPMCmd/Simulator/src/TcpServer.c b/TPMCmd/Simulator/src/TcpServer.c
index c12b6c6..5adb90a 100644
--- a/TPMCmd/Simulator/src/TcpServer.c
+++ b/TPMCmd/Simulator/src/TcpServer.c
@@ -42,7 +42,7 @@
 #include <stdio.h>

 #include <stdbool.h>

 

-#ifdef _MSC_VER

+#ifdef _WIN32

 #   pragma warning(push, 3)

 #   include <windows.h>

 #   include <winsock.h>

@@ -110,7 +110,7 @@ CreateSocket(
     int res;

 //  

     // Initialize Winsock

-#ifdef _MSC_VER

+#ifdef _WIN32

     WSADATA              wsaData;

     res = WSAStartup(MAKEWORD(2, 2), &wsaData);

     if(res != 0)

@@ -297,7 +297,7 @@ PlatformSignalService(
     int              PortNumber

     )

 {

-#if defined(_MSC_VER)

+#if defined(_WIN32)

     HANDLE               hPlatformSvc;

     int                  ThreadId;

     int                  port = PortNumber;

@@ -324,7 +324,7 @@ PlatformSignalService(
         printf("pthread_create failed: %s", strerror(ret));

     }

     return ret;

-#endif // _MSC_VER

+#endif // _WIN32

 }

 

 //*** RegularCommandService()

@@ -394,13 +394,13 @@ SimulatorTimeServiceRoutine(
     {

         uint64_t  curTime;

 

-#if defined(_MSC_VER)

+#if defined(_WIN32)

         Sleep((DWORD)timeout);

 #else

         struct timespec     req = { timeout / 1000, (timeout % 1000) * 1000 };

         struct timespec     rem;

         nanosleep(&req, &rem);

-#endif // _MSC_VER

+#endif // _WIN32

         curTime = _plat__RealTime();

 

         // May need to issue several ticks if the Sleep() took longer than asked,

@@ -435,7 +435,7 @@ ActTimeService(
     int                  ret = 0;

     if(!running)

     {

-#if defined(_MSC_VER)

+#if defined(_WIN32)

         HANDLE               hThr;

         int                  ThreadId;

     //

@@ -456,7 +456,7 @@ ActTimeService(
 //

         ret = pthread_create(&thread_id, NULL, (void*)SimulatorTimeServiceRoutine,

             (LPVOID)(INT_PTR)NULL);

-#endif // _MSC_VER

+#endif // _WIN32

 

         if(ret != 0)

             printf("ACT thread Creation failed\n");