am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__."

* commit '2e406f64bd01395977c66c4afc518b61841f507c':
  Use __ANDROID__ instead of __BRILLO__.
This commit is contained in:
Daniel Erat 2015-08-20 00:01:31 +00:00 committed by Android Git Automerger
commit f10e1ed1b2

View file

@ -42,7 +42,6 @@ metrics_daemon_sources := \
serialization/serialization_utils.cc serialization/serialization_utils.cc
metrics_CFLAGS := -Wall \ metrics_CFLAGS := -Wall \
-D__BRILLO__ \
-Wno-char-subscripts \ -Wno-char-subscripts \
-Wno-missing-field-initializers \ -Wno-missing-field-initializers \
-Wno-unused-function \ -Wno-unused-function \