| commit | 9a995b2c8fe4ee0567e850f7f63bfd661974f6e7 | [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 | d45556895c957e3f50d93041207acf4b17433ec5 [diff] | |
| parent | 69200d9191be9f95762a10f6d6d3d5df28922d2e [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 \