Use __ANDROID__ instead of __BRILLO__.
__ANDROID__ is defined automatically by the toolchain.
Bug: 23358460
Change-Id: Ieea8035dc1ad7d8dbdbe91936b364d8c15f447dc
diff --git a/Android.mk b/Android.mk
index 30a3ed8..bffb1fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,8 +19,7 @@
# Common variables
# ========================================================
-minijailCommonCFlags := -D__BRILLO__ -Wall -Werror \
- -Wno-unused-function -Wno-unused-parameter
+minijailCommonCFlags := -Wall -Werror -Wno-unused-function -Wno-unused-parameter
minijailCommonSharedLibraries := libcap-ng
# libminijail shared library for target
diff --git a/libminijail.c b/libminijail.c
index 109bcdc..26186e3 100644
--- a/libminijail.c
+++ b/libminijail.c
@@ -683,7 +683,7 @@
void drop_caps(const struct minijail *j)
{
-#if defined(__BRILLO__)
+#if defined(__ANDROID__)
/*
* Temporarily disable capabilities support until Minijail can use
* libcap-ng.
@@ -951,7 +951,7 @@
int setup_preload(void)
{
-#if defined(__BRILLO__)
+#if defined(__ANDROID__)
/* Don't use LDPRELOAD on Brillo. */
return 0;
#else
