| commit | 728c39597e589b972959d43f4be91f011c34bec1 | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Wed Aug 19 23:47:47 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Aug 19 23:47:47 2015 +0000 |
| tree | 29bc3a93cc321b16566f4dbd2b73ba075a7e9e86 | |
| parent | e04006dbf70745e455253db7e1d7516b89f6f73f [diff] | |
| parent | f6ddef0fa5248c81c67bdc4cd5cc95fc0b19b54b [diff] |
Merge "Use __ANDROID__ instead of __BRILLO__."
diff --git a/metricsd/Android.mk b/metricsd/Android.mk index 0442147..9fd8eda 100644 --- a/metricsd/Android.mk +++ b/metricsd/Android.mk
@@ -42,7 +42,6 @@ serialization/serialization_utils.cc metrics_CFLAGS := -Wall \ - -D__BRILLO__ \ -Wno-char-subscripts \ -Wno-missing-field-initializers \ -Wno-unused-function \