Merge "Move __BRILLO__ to the core build system"

am: 3931873418

* commit '39318734186de8b2ed09d827f69877bf9bb8c9aa':
  Move __BRILLO__ to the core build system
This commit is contained in:
Dan Willemsen 2015-12-16 23:25:10 +00:00 committed by android-build-merger
commit 152755aa81

View file

@ -186,6 +186,15 @@ include $(BUILD_SYSTEM)/envsetup.mk
# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS
FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(OUT_DIR) $(SCAN_EXCLUDE_DIRS) .repo .git)
ifdef BRILLO
# Add a C define that identifies 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).
COMMON_GLOBAL_CFLAGS += -D__BRILLO__
endif
# ---------------------------------------------------------------
# We run gcc/clang with PWD=/proc/self/cwd to remove the $TOP
# from the debug output. That way two builds in two different