OEMCrypto v16.1

Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b

libwvdrmengine/oemcrypto/odk/src/odk_overflow.h

@@ -0,0 +1,31 @@
+/* Copyright 2019 Google LLC. All rights reserved. This file and proprietary */
+/* source code may only be used and distributed under the Widevine Master */
+/* License Agreement. */
+
+#ifndef WIDEVINE_ODK_SRC_ODK_OVERFLOW_H_
+#define WIDEVINE_ODK_SRC_ODK_OVERFLOW_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __has_builtin
+#  define __has_builtin(x) 0
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ >= 5) || \
+    __has_builtin(__builtin_add_overflow)
+#  define odk_sub_overflow_u64 __builtin_sub_overflow
+#  define odk_add_overflow_u64 __builtin_add_overflow
+#  define odk_add_overflow_ux __builtin_add_overflow
+#else
+int odk_sub_overflow_u64(uint64_t a, uint64_t b, uint64_t* c);
+int odk_add_overflow_u64(uint64_t a, uint64_t b, uint64_t* c);
+int odk_add_overflow_ux(size_t a, size_t b, size_t* c);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WIDEVINE_ODK_SRC_ODK_OVERFLOW_H_ */