diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:56:31 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:56:31 +0000 |
commit | 9540c518ba7cfb87fa695f1a454bece3d6fc9c5d (patch) | |
tree | 2c8dc2d7c43b54500f1adef2ebda24f162dd29b8 | |
parent | 3f39a35f8862d2b3a679b71a2392ee4b49a32dfe (diff) | |
parent | f842edd6333ad3c9e79515e27a177c1ca45d1eff (diff) | |
download | ms-tpm-20-ref-android14-mainline-mediaprovider-release.tar.gz |
Snap for 10453563 from f842edd6333ad3c9e79515e27a177c1ca45d1eff to mainline-mediaprovider-releaseaml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000android14-mainline-mediaprovider-release
Change-Id: I4d9489cc09d05b0946773bc6af17083f991d389d
-rw-r--r-- | Android.bp | 15 | ||||
-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 | 16 |
4 files changed, 23 insertions, 12 deletions
@@ -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");
|