summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-12-16 13:36:28 -0800
committerDan Willemsen <dwillemsen@google.com>2015-12-16 14:20:56 -0800
commit45ef58d1f21710ee490c6a95676962563ce72759 (patch)
treee262c4d6ec1c050537411ad5e63fc5bd9a4b0dfe
parent9a7276f1d0d031d70fee23ddf70691b8c12f68be (diff)
downloadbrillo-45ef58d1f21710ee490c6a95676962563ce72759.tar.gz
Move __BRILLO__ to the core build system
In preparation for locking down COMMON_GLOBAL_CFLAGS Bug: 26165350 Change-Id: I1576604ce08330578f5542feffe589310d8f9673
-rw-r--r--brillo_base.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/brillo_base.mk b/brillo_base.mk
index 5e48b52..d002ec3 100644
--- a/brillo_base.mk
+++ b/brillo_base.mk
@@ -323,13 +323,8 @@ BOARD_SEPOLICY_DIRS := $(BOARD_SEPOLICY_DIRS) device/generic/brillo/sepolicy
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.atrace.tags.enableflags=0
-# Define a make variable and a C define that identify Brillo targets. __BRILLO__
-# should only be used to differentiate between Brillo and non-Brillo-but-Android
-# environments. Use __ANDROID__ instead to test if something is being built in
-# an Android-derived environment (including Brillo) as opposed to an
-# entirely different environment (e.g. Chrome OS).
+# Define a make variable that identifies Brillo targets.
BRILLO := 1
-COMMON_GLOBAL_CFLAGS += -D__BRILLO__
# Generate Breakpad symbols.
BREAKPAD_GENERATE_SYMBOLS := true