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

* commit '9a995b2c8fe4ee0567e850f7f63bfd661974f6e7':
  Use __ANDROID__ instead of __BRILLO__.
This commit is contained in:
Daniel Erat 2015-08-19 23:55:00 +00:00 committed by Android Git Automerger
commit 2e406f64bd

View file

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