diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:03:55 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:03:55 +0000 |
commit | 9e5429c5256f78e2e2ec01538a5da1c96d757a94 (patch) | |
tree | d2acdd00055201a80cb3fe837194abe91df1b57a | |
parent | 36332c349650be7b66656865398f493a4f7ccc0b (diff) | |
parent | 9c582385a4ea1a6aa22355ee3d1f203592b2e878 (diff) | |
download | gatekeeper-aml_swc_341312020.tar.gz |
Snap for 10453563 from 9c582385a4ea1a6aa22355ee3d1f203592b2e878 to mainline-media-swcodec-releaseaml_swc_341711000aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010android14-mainline-media-swcodec-release
Change-Id: Ia2541f76ccb13ef80dc70f63577d14547b920b2e
-rw-r--r-- | Android.bp | 14 | ||||
-rw-r--r-- | OWNERS | 5 | ||||
-rw-r--r-- | gatekeeper.cpp | 13 |
3 files changed, 26 insertions, 6 deletions
@@ -33,17 +33,21 @@ cc_library_shared { "-Wall", "-Werror", "-g", + "-fno-sanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp", ], header_libs: [ "libhardware_headers", ], - + target: { + windows: { + enabled: true, + host_ldlibs: [ + "-lws2_32", + ], + }, + }, export_include_dirs: ["include"], - // TODO(krasin): reenable coverage flags, when the new Clang toolchain is released. - // Currently, if enabled, these flags will cause an internal error in Clang. - // Bug: 25119481 - clang_cflags: ["-fno-sanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp"], } // libgatekeeper_static is an empty static library that exports @@ -1,2 +1,5 @@ -jdanis@google.com +# Bug component: 1124862 +drysdale@google.com +oarbildo@google.com +subrahmanyaman@google.com swillden@google.com 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) { |