From 1f05edabf412c7fc3504eaeb9b7d46301a4a0218 Mon Sep 17 00:00:00 2001 From: Moandor Date: Wed, 19 Aug 2020 12:08:28 +0800 Subject: [PATCH] [build] allow custom config file in Android.mk (#5418) This commit moves OPENTHREAD_CONFIG_FILE to OPENTHREAD_PROJECT_CFLAGS in Android.mk to allow projects to specify their own config files. --- Android.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index 1c2f69d85..e58662b22 100644 --- a/Android.mk +++ b/Android.mk @@ -30,11 +30,14 @@ LOCAL_PATH := $(call my-dir) OPENTHREAD_DEFAULT_VERSION := $(shell cat $(LOCAL_PATH)/.default-version) OPENTHREAD_SOURCE_VERSION := $(shell git -C $(LOCAL_PATH) describe --always --match "[0-9].*" 2> /dev/null) -OPENTHREAD_PROJECT_CFLAGS ?= -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" + +OPENTHREAD_PROJECT_CFLAGS ?= \ + -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \ + -DOPENTHREAD_CONFIG_FILE=\ \ + $(NULL) OPENTHREAD_PUBLIC_CFLAGS := \ -DOPENTHREAD_CONFIG_COMMISSIONER_ENABLE=1 \ - -DOPENTHREAD_CONFIG_FILE=\ \ -DOPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE=1 \ -DOPENTHREAD_CONFIG_MAC_FILTER_ENABLE=1 \ -DOPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE=1 \ @@ -499,8 +502,10 @@ LOCAL_CPPFLAGS := \ -pedantic-errors \ $(NULL) -LOCAL_CFLAGS := \ - -DOPENTHREAD_CONFIG_FILE=\ \ +LOCAL_CFLAGS := \ + $(OPENTHREAD_PUBLIC_CFLAGS) \ + $(OPENTHREAD_PRIVATE_CFLAGS) \ + $(OPENTHREAD_PROJECT_CFLAGS) \ $(NULL) LOCAL_C_INCLUDES := \