android: Fix build after 45de8bf76e32

OS_LINUX is not defined on Android. Chromium made this call and we can’t
revisit it here and now.

Change-Id: I70fd6ac35ba9731e2fd06792bf8cae332e2b360c
Reviewed-on: https://chromium-review.googlesource.com/700655
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Mark Mentovai 2017-10-04 13:11:54 -04:00 committed by Commit Bot
parent 78b6353e45
commit f6aebd8baf

View File

@ -25,7 +25,7 @@
#include <mach/mach_types.h> #include <mach/mach_types.h>
#elif defined(OS_WIN) #elif defined(OS_WIN)
#include "util/win/address_types.h" #include "util/win/address_types.h"
#elif defined(OS_LINUX) #elif defined(OS_LINUX) || defined(OS_ANDROID)
#include "util/linux/address_types.h" #include "util/linux/address_types.h"
#else #else
#error "Unhandled OS type" #error "Unhandled OS type"
@ -53,7 +53,7 @@ using VMSize = mach_vm_size_t;
using VMAddress = WinVMAddress; using VMAddress = WinVMAddress;
using VMSize = WinVMSize; using VMSize = WinVMSize;
#elif defined(OS_LINUX) #elif defined(OS_LINUX) || defined(OS_ANDROID)
using VMAddress = LinuxVMAddress; using VMAddress = LinuxVMAddress;
using VMSize = LinuxVMSize; using VMSize = LinuxVMSize;