[android] disable some optional features (#3821)

This commit removes unnecessary features of OpenThread on Android platform.
This commit also removes features disabled in openthread-config-android.h so
that these definitions can be overridden in Android.mk without warning.
This commit is contained in:
Yakun Xu
2019-05-21 18:01:53 -07:00
committed by Jonathan Hui
parent fcac459e05
commit 167362130c
2 changed files with 39 additions and 49 deletions
+39 -6
View File
@@ -42,6 +42,27 @@ OPENTHREAD_COMMON_FLAGS := \
-DPACKAGE_URL=\"http://github.com/openthread/openthread\" \
$(NULL)
# Enable required features for on-device tests.
ifeq ($(TARGET_BUILD_VARIANT),eng)
OPENTHREAD_COMMON_FLAGS += \
-DOPENTHREAD_ENABLE_DIAG=1 \
-DOPENTHREAD_ENABLE_MAC_FILTER=1 \
$(NULL)
endif
# Enable all optional features for CI tests.
ifeq ($(TARGET_PRODUCT),generic)
OPENTHREAD_COMMON_FLAGS += \
-DOPENTHREAD_ENABLE_APPLICATION_COAP=1 \
-DOPENTHREAD_ENABLE_CERT_LOG=1 \
-DOPENTHREAD_ENABLE_COMMISSIONER=1 \
-DOPENTHREAD_ENABLE_DHCP6_CLIENT=1 \
-DOPENTHREAD_ENABLE_DHCP6_SERVER=1 \
-DOPENTHREAD_ENABLE_DNS_CLIENT=1 \
-DOPENTHREAD_ENABLE_MTD_NETWORK_DIAGNOSTIC=1 \
$(NULL)
endif
include $(CLEAR_VARS)
LOCAL_MODULE := spi-hdlc-adapter
@@ -68,14 +89,12 @@ LOCAL_C_INCLUDES := \
$(NULL)
LOCAL_CFLAGS := \
-D_GNU_SOURCE \
-DMBEDTLS_CONFIG_FILE=\"mbedtls-config.h\" \
-DOPENTHREAD_CONFIG_FILE=\<openthread-config-android.h\> \
$(OPENTHREAD_COMMON_FLAGS) \
-DOPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE=1 \
-DOPENTHREAD_FTD=1 \
-DOPENTHREAD_POSIX=1 \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
-DSPINEL_PLATFORM_HEADER=\"spinel_platform.h\" \
$(NULL)
@@ -246,6 +265,12 @@ LOCAL_SRC_FILES := \
include $(OT_EXTRA_BUILD_CONFIG)
ifeq ($(filter -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=%,$(LOCAL_CFLAGS)),)
LOCAL_CFLAGS += \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
$(NULL)
endif
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
@@ -264,7 +289,6 @@ LOCAL_C_INCLUDES := \
$(NULL)
LOCAL_CFLAGS := \
-D_GNU_SOURCE \
-DMBEDTLS_CONFIG_FILE=\"mbedtls-config.h\" \
-DOPENTHREAD_CONFIG_FILE=\<openthread-config-android.h\> \
$(OPENTHREAD_COMMON_FLAGS) \
@@ -273,7 +297,6 @@ LOCAL_CFLAGS := \
-DOPENTHREAD_FTD=1 \
-DOPENTHREAD_POSIX=1 \
-DOPENTHREAD_POSIX_APP_TYPE=2 \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
-DSPINEL_PLATFORM_HEADER=\"spinel_platform.h\" \
$(NULL)
@@ -297,6 +320,12 @@ LOCAL_SRC_FILES := \
include $(OT_EXTRA_BUILD_CONFIG)
ifeq ($(filter -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=%,$(LOCAL_CFLAGS)),)
LOCAL_CFLAGS += \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
$(NULL)
endif
LOCAL_STATIC_LIBRARIES = ot-core
include $(BUILD_EXECUTABLE)
@@ -316,7 +345,6 @@ LOCAL_C_INCLUDES := \
$(NULL)
LOCAL_CFLAGS := \
-D_GNU_SOURCE \
-DMBEDTLS_CONFIG_FILE=\"mbedtls-config.h\" \
-DOPENTHREAD_CONFIG_FILE=\<openthread-config-android.h\> \
$(OPENTHREAD_COMMON_FLAGS) \
@@ -324,7 +352,6 @@ LOCAL_CFLAGS := \
-DOPENTHREAD_FTD=1 \
-DOPENTHREAD_POSIX=1 \
-DOPENTHREAD_POSIX_APP_TYPE=1 \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
-DSPINEL_PLATFORM_HEADER=\"spinel_platform.h\" \
$(NULL)
@@ -348,5 +375,11 @@ LOCAL_SRC_FILES := \
include $(OT_EXTRA_BUILD_CONFIG)
ifeq ($(filter -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=%,$(LOCAL_CFLAGS)),)
LOCAL_CFLAGS += \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
$(NULL)
endif
LOCAL_STATIC_LIBRARIES = ot-core
include $(BUILD_EXECUTABLE)
-43
View File
@@ -26,18 +26,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/* Define to 1 if you want to enable CoAP to an application. */
#define OPENTHREAD_ENABLE_APPLICATION_COAP 0
/* Define to 1 to enable the border agent feature. */
#define OPENTHREAD_ENABLE_BORDER_AGENT 1
/* Define to 1 if you want to enable Border Router */
#define OPENTHREAD_ENABLE_BORDER_ROUTER 1
/* Define to 1 if you want to enable log for certification test */
#define OPENTHREAD_ENABLE_CERT_LOG 1
/* Define to 1 if you want to enable channel manager feature */
#define OPENTHREAD_ENABLE_CHANNEL_MANAGER 0
@@ -47,21 +41,6 @@
/* Define to 1 if you want to use child supervision feature */
#define OPENTHREAD_ENABLE_CHILD_SUPERVISION 1
/* Define to 1 to enable the commissioner role. */
#define OPENTHREAD_ENABLE_COMMISSIONER 1
/* Define to 1 if you want to enable DHCPv6 Client */
#define OPENTHREAD_ENABLE_DHCP6_CLIENT 1
/* Define to 1 if you want to enable DHCPv6 Server */
#define OPENTHREAD_ENABLE_DHCP6_SERVER 1
/* Define to 1 if you want to use diagnostics module */
#define OPENTHREAD_ENABLE_DIAG 1
/* Define to 1 if you want to enable DNS Client */
#define OPENTHREAD_ENABLE_DNS_CLIENT 1
/* Define to 1 to enable dtls support. */
#define OPENTHREAD_ENABLE_DTLS 1
@@ -74,34 +53,12 @@
/* Define to 1 if you want to use legacy network support */
#define OPENTHREAD_ENABLE_LEGACY 1
/* Define to 1 if you want to use MAC filter feature */
#define OPENTHREAD_ENABLE_MAC_FILTER 1
/* Define to 1 to enable network diagnostic for MTD. */
#define OPENTHREAD_ENABLE_MTD_NETWORK_DIAGNOSTIC 0
/* Define to 1 if you want to enable support for multiple OpenThread
instances. */
#define OPENTHREAD_ENABLE_MULTIPLE_INSTANCES 0
/* Define to 1 to enable the NCP SPI interface. */
#define OPENTHREAD_ENABLE_NCP_SPI 0
/* Define to 1 if using NCP Spinel Encrypter */
#define OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER 0
/* Define to 1 to enable the NCP UART interface. */
#define OPENTHREAD_ENABLE_NCP_UART 1
/* Define to 1 if using NCP vendor hook */
#define OPENTHREAD_ENABLE_NCP_VENDOR_HOOK 0
/* Define to 1 to build posix application. */
#define OPENTHREAD_PLATFORM_POSIX_APP 1
/* Define to 1 if you want to enable raw link-layer API */
#define OPENTHREAD_ENABLE_RAW_LINK_API 0
/* Define to 1 if you want to enable Service */
#define OPENTHREAD_ENABLE_SERVICE 1