diff options
| author | Daniel Erat <derat@google.com> | 2015-08-19 16:25:34 -0600 |
|---|---|---|
| committer | Daniel Erat <derat@google.com> | 2015-08-19 16:25:34 -0600 |
| commit | 2908f10c54864392a9826fb136eac4997fe785ae (patch) | |
| tree | 86ac0a04ff4c3c17d82481e76d30b1c17ef43fb1 | |
| parent | 92d2cebf70919c9b1d0e6779837d245859736c98 (diff) | |
| download | platform_external_libbrillo-2908f10c54864392a9826fb136eac4997fe785ae.tar.gz platform_external_libbrillo-2908f10c54864392a9826fb136eac4997fe785ae.tar.bz2 platform_external_libbrillo-2908f10c54864392a9826fb136eac4997fe785ae.zip | |
Use __ANDROID__ instead of __BRILLO__.
__ANDROID__ is defined automatically by the toolchain.
Bug: 23358460
Change-Id: I125d56638f06f0eb10ba0cde147ab835522959f1
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | chromeos/process_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -109,7 +109,7 @@ libchromeos_test_sources := \ 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 @@ TEST_F(ProcessTest, NoParams) { 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"); |