ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix the MacOS build of incremental*" am: f10099d79a

Browse source 
Change-Id: Ic5885f76a96d4dd258d0a93df9af1e5ba71c1847
This commit is contained in:
Automerger Merge Worker 2020-02-21 01:59:26 +00:00
commit 1714e21a8f
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/client/incremental.cpp
View file

@ -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 {

12
adb/client/incremental_server.cpp
View file

@ -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>