diff options
| author | Oystein Eftevaag <oysteine@google.com> | 2023-02-08 00:02:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-08 00:02:25 +0000 |
| commit | f72791cedf460c302081f5f9c2d6ed565d2de67f (patch) | |
| tree | 7d28bf56751f90c7e3a1b598b382c4b3f9559903 | |
| parent | 346d5b3cefa07381e732375041e1ee101f0b5918 (diff) | |
| parent | 3336572119638b79c3924d5495ee0a6f182178f6 (diff) | |
| download | gatekeeper-f72791cedf460c302081f5f9c2d6ed565d2de67f.tar.gz | |
Enable Windows host compilation of gatekeeper am: 55b287d6bf am: 0adbed35cf am: 3336572119
Original change: https://android-review.googlesource.com/c/platform/system/gatekeeper/+/2417999
Change-Id: Iaf09a708dff521ff18b15459df9f2655c39cfe28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 9 | ||||
| -rw-r--r-- | gatekeeper.cpp | 13 |
2 files changed, 21 insertions, 1 deletions
@@ -38,7 +38,14 @@ cc_library_shared { header_libs: [ "libhardware_headers", ], - + target: { + windows: { + enabled: true, + host_ldlibs: [ + "-lws2_32", + ], + }, + }, export_include_dirs: ["include"], } diff --git a/gatekeeper.cpp b/gatekeeper.cpp index 57be100..cc6b1a3 100644 --- a/gatekeeper.cpp +++ b/gatekeeper.cpp @@ -16,11 +16,24 @@ #include <gatekeeper/UniquePtr.h> #include <gatekeeper/gatekeeper.h> +#ifdef _WIN32 +#include <winsock2.h> +#define htobe32 htonl +#define htobe64 htonll_gk +#else #include <endian.h> +#endif + #include <stddef.h> #define DAY_IN_MS (1000 * 60 * 60 * 24) +#ifdef _WIN32 +__forceinline uint64_t htonll_gk(uint64_t value) { + return (((uint64_t)htonl(value & 0xFFFFFFFFUL)) << 32) | htonl((uint32_t)(value >> 32)); +} +#endif + namespace gatekeeper { void GateKeeper::Enroll(const EnrollRequest &request, EnrollResponse *response) { |