From b3b92f45fdccd28c117a17bd4450d23a55d72210 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Mon, 25 Jul 2016 16:09:21 -0700 Subject: cts: Move C flags to cts/build.mk We should separate global Makefile from CTS stuff as much as possible. This makes reading and chaging code simpler. BUG=none BRANCH=none TEST=make buildall Change-Id: If9e99e0e9b660707b1e22f2362bd6f782930dc09 Signed-off-by: Daisuke Nojiri Reviewed-on: https://chromium-review.googlesource.com/363006 Reviewed-by: Randall Spangler Reviewed-by: Chris Chen --- Makefile.toolchain | 3 +-- cts/build.mk | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.toolchain b/Makefile.toolchain index d611c1bc94..0933c5f481 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -35,8 +35,7 @@ CFLAGS_DEBUG= -g CFLAGS_INCLUDE=$(foreach i,$(includes),-I$(i) ) -I. CFLAGS_TEST=$(if $(TEST_BUILD),-DTEST_BUILD \ -DTEST_TASKFILE=$(PROJECT).tasklist,) \ - $(if $(CTS_MODULE), -DCTS_MODULE=$(CTS_MODULE) \ - -DCTS_TASKFILE=cts.tasklist) \ + $(if $(CTS_MODULE), $(CFLAGS_CTS)) \ $(if $(EMU_BUILD),-DEMU_BUILD) \ $(if $($(PROJECT)-scale),-DTEST_TIME_SCALE=$($(PROJECT)-scale)) \ -DTEST_$(PROJECT) -DTEST_$(UC_PROJECT) diff --git a/cts/build.mk b/cts/build.mk index 6766a9fb4c..59fa85547c 100644 --- a/cts/build.mk +++ b/cts/build.mk @@ -3,6 +3,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +CFLAGS_CTS=-DCTS_MODULE -DCTS_TASKFILE=cts.tasklist + ifeq ($(BOARD),stm32l476g-eval) cts-y+=$(CTS_MODULE)/th.o cts-y+=common/th_common.o -- cgit v1.2.1