aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorDaniel Erat <derat@google.com>2015-08-19 16:25:34 -0600
committerDaniel Erat <derat@google.com>2015-08-19 16:25:34 -0600
commit2908f10c54864392a9826fb136eac4997fe785ae (patch)
tree86ac0a04ff4c3c17d82481e76d30b1c17ef43fb1 /Android.mk
parent92d2cebf70919c9b1d0e6779837d245859736c98 (diff)
downloadlibbrillo-2908f10c54864392a9826fb136eac4997fe785ae.tar.gz
Use __ANDROID__ instead of __BRILLO__.
__ANDROID__ is defined automatically by the toolchain. Bug: 23358460 Change-Id: I125d56638f06f0eb10ba0cde147ab835522959f1
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index f6b33d7..d080d1e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 \