diff options
| author | Ivan Chen <yulunchen@google.com> | 2023-05-17 03:32:45 +0000 |
|---|---|---|
| committer | Ivan Chen <yulunchen@google.com> | 2023-05-17 03:32:45 +0000 |
| commit | d7c9c6beb03ee5725232b9ac3bfe4825e1e227cb (patch) | |
| tree | 3a0d6776c0e76e325d1b087cd51a850cb871358e /Makefile | |
| parent | 8641442366bd7c2c133e302a57f904dfac3c896b (diff) | |
| parent | b34dc2ae9022e2fbb57ae6477891ff32954c62fd (diff) | |
| download | chrome-ec-firmware-brya-14505.B-main.tar.gz | |
Merge remote-tracking branch cros/main into firmware-brya-14505.B-mainfirmware-brya-14505.B-main
Generated by: util/update_release_branch.py --board brya firmware-brya-14505.B-main
Relevant changes:
git log --oneline 8641442366..b34dc2ae90 -- board/brya board/brya
util/getversion.sh
BRANCH=None
TEST=`make -j buildall`
Force-Relevant-Builds: all
Change-Id: I63149b4c1782b3ed57f2556755901c21f5f1e3e9
Signed-off-by: Ivan Chen <yulunchen@google.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -290,6 +290,12 @@ include test/build.mk include util/build.mk include util/lock/build.mk + +ifeq ($(CONFIG_BORINGSSL_CRYPTO), y) +include third_party/boringssl/common/build.mk +include crypto/build.mk +endif + includes+=$(includes-y) # Wrapper for fetching all the sources relevant to this build @@ -326,6 +332,11 @@ all-obj-$(1)+=$(call objs_from_dir_p,fuzz,$(PROJECT),$(1)) else all-obj-$(1)+=$(call objs_from_dir_p,test,$(PROJECT),$(1)) endif +ifeq ($(CONFIG_BORINGSSL_CRYPTO), y) +all-obj-$(1)+= \ + $(call objs_from_dir_p,third_party/boringssl/common,boringssl,$(1)) +all-obj-$(1)+= $(call objs_from_dir_p,crypto,crypto,$(1)) +endif endef # Get all sources to build @@ -372,6 +383,10 @@ dirs+=builtin else dirs+=libc endif +ifeq ($(CONFIG_BORINGSSL_CRYPTO), y) +dirs+=third_party/boringssl/common +dirs+=crypto +endif common_dirs=util ifeq ($(custom-ro_objs-y),) |