Use __ANDROID__ instead of __BRILLO__.
__ANDROID__ is defined automatically by the toolchain.
Bug: 23358460
Change-Id: I125d56638f06f0eb10ba0cde147ab835522959f1
diff --git a/Android.mk b/Android.mk
index f6b33d7..d080d1e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,7 +109,7 @@
chromeos/strings/string_utils_unittest.cc \
chromeos/url_utils_unittest.cc
-libchromeos_CFLAGS := -Wall -D__BRILLO__ \
+libchromeos_CFLAGS := -Wall \
-Wno-char-subscripts -Wno-missing-field-initializers \
-Wno-unused-function -Wno-unused-parameter -Werror
libchromeos_CPPFLAGS := -Wno-non-virtual-dtor -Wno-sign-promo \
diff --git a/chromeos/process_unittest.cc b/chromeos/process_unittest.cc
index c74e1ed..1d83cb7 100644
--- a/chromeos/process_unittest.cc
+++ b/chromeos/process_unittest.cc
@@ -17,7 +17,7 @@
using base::FilePath;
// This test assumes the following standard binaries are installed.
-#if defined(__BRILLO__)
+#if defined(__ANDROID__)
# define SYSTEM_PREFIX "/system"
#else
# define SYSTEM_PREFIX ""
@@ -266,7 +266,7 @@
EXPECT_EQ(-1, process_.Run());
}
-#if !defined(__BRILLO__) // Bionic intercepts the segfault in brillo
+#if !defined(__BIONIC__) // Bionic intercepts the segfault on Android.
TEST_F(ProcessTest, SegFaultHandling) {
process_.AddArg(kBinSh);
process_.AddArg("-c");
