From b65950642de174239189631779c26b2a05b209d0 Mon Sep 17 00:00:00 2001
From: Yurii Zubrytskyi <zyy@google.com>
Date: Thu, 20 Feb 2020 15:30:45 -0800
Subject: [PATCH] Fix the MacOS build of incremental*

Test: local build, no feature code changes

Change-Id: Ic0072b06f6bfd6b12f26c4056bd3192cd3fdd778
---
 adb/client/incremental.cpp        |  7 +------
 adb/client/incremental_server.cpp | 12 +-----------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/adb/client/incremental.cpp b/adb/client/incremental.cpp
index b728a6bb3..6499d4603 100644
--- a/adb/client/incremental.cpp
+++ b/adb/client/incremental.cpp
@@ -16,6 +16,7 @@
 
 #include "incremental.h"
 
+#include <android-base/endian.h>
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
 #include <openssl/base64.h>
@@ -26,12 +27,6 @@
 #include "commandline.h"
 #include "sysdeps.h"
 
-#ifndef _WIN32
-#include <endian.h>
-#else
-#define be32toh(x) _byteswap_ulong(x)
-#endif
-
 using namespace std::literals;
 
 namespace incremental {
diff --git a/adb/client/incremental_server.cpp b/adb/client/incremental_server.cpp
index d9fd77ae2..90376727f 100644
--- a/adb/client/incremental_server.cpp
+++ b/adb/client/incremental_server.cpp
@@ -25,17 +25,7 @@
 #include "adb_utils.h"
 #include "sysdeps.h"
 
-#ifndef _WIN32
-#include <endian.h>
-#else
-#define be64toh(x) _byteswap_uint64(x)
-#define be32toh(x) _byteswap_ulong(x)
-#define be16toh(x) _byteswap_ushort(x)
-#define htobe64(x) _byteswap_uint64(x)
-#define htobe32(x) _byteswap_ulong(x)
-#define htobe16(x) _byteswap_ushort(x)
-#endif
-
+#include <android-base/endian.h>
 #include <android-base/strings.h>
 #include <lz4.h>
 #include <stdio.h>