Support building Trusty with bear

Author: gsingh93

Makefile

@@ -16,6 +16,8 @@ VERBOSE ?= 0
 
 ARCH ?= x86_64
 
+BEAR ?= 0
+
 GREEN := $(shell tput setaf 2)
 YELLOW := $(shell tput setaf 3)
 NC := $(shell tput sgr0)
@@ -402,6 +404,11 @@ ATF_DIR := $(TRUSTY_OUT)/atf/qemu/debug
 ATF_BL1 := $(ATF_DIR)/bl1.bin
 ATF_BL33 := $(ATF_DIR)/bl33.bin
 
+BEAR_CMD :=
+ifeq ($(BEAR),1)
+  BEAR_CMD := bear --
+endif
+
 .PHONY: trusty-init
 trusty-init:
 	mkdir -p $(TRUSTY_SRC)
@@ -410,7 +417,9 @@ trusty-init:
 
 .PHONY: trusty
 trusty $(ATF_BL1): | $(TRUSTY_SRC)
-	$(TRUSTY_SRC)/trusty/vendor/google/aosp/scripts/build.py --build-root $(TRUSTY_BUILD_ROOT) --skip-tests $(TRUSTY_TARGET)
+	$(BEAR_CMD) $(TRUSTY_SRC)/trusty/vendor/google/aosp/scripts/build.py \
+		--build-root $(TRUSTY_BUILD_ROOT) \
+		--skip-tests $(TRUSTY_TARGET)
 	$(MAKE) trusty_bl33
 
 .PHONY: trusty_bl33