From ff259b845bca662278813c0bd57f46a3e02edb6d Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Sat, 22 Oct 2022 04:02:18 +0800 Subject: [PATCH] [android] only set -std=c99 for mbedtls (#8310) --- Android.mk | 56 ++++++++++++++++++++++++++++---------- script/check-android-build | 3 +- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/Android.mk b/Android.mk index 4cb16c6f6..d79ce9b18 100644 --- a/Android.mk +++ b/Android.mk @@ -405,6 +405,46 @@ LOCAL_SRC_FILES := \ src/posix/platform/trel.cpp \ src/posix/platform/udp.cpp \ src/posix/platform/utils.cpp \ + third_party/tcplp/bsdtcp/tcp_usrreq.c \ + third_party/tcplp/bsdtcp/tcp_subr.c \ + third_party/tcplp/bsdtcp/tcp_output.c \ + third_party/tcplp/bsdtcp/cc/cc_newreno.c \ + third_party/tcplp/bsdtcp/tcp_reass.c \ + third_party/tcplp/bsdtcp/tcp_timewait.c \ + third_party/tcplp/bsdtcp/tcp_sack.c \ + third_party/tcplp/bsdtcp/tcp_input.c \ + third_party/tcplp/bsdtcp/tcp_timer.c \ + third_party/tcplp/lib/bitmap.c \ + third_party/tcplp/lib/cbuf.c \ + third_party/tcplp/lib/lbuf.c \ + $(OPENTHREAD_PROJECT_SRC_FILES) \ + $(NULL) + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_MODULE := libopenthread-mbedtls +LOCAL_MODULE_TAGS := eng +LOCAL_C_INCLUDES := \ + $(OPENTHREAD_PROJECT_INCLUDES) \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/src \ + $(LOCAL_PATH)/src/cli \ + $(LOCAL_PATH)/src/core \ + $(LOCAL_PATH)/src/posix/platform \ + $(LOCAL_PATH)/src/posix/platform/include \ + $(LOCAL_PATH)/third_party/mbedtls \ + $(LOCAL_PATH)/third_party/mbedtls/repo/include \ + $(NULL) + +LOCAL_CFLAGS := \ + -std=c99 \ + $(OPENTHREAD_PUBLIC_CFLAGS) \ + $(OPENTHREAD_PRIVATE_CFLAGS) \ + $(OPENTHREAD_PROJECT_CFLAGS) \ + +LOCAL_SRC_FILES := \ third_party/mbedtls/repo/library/aes.c \ third_party/mbedtls/repo/library/aesni.c \ third_party/mbedtls/repo/library/arc4.c \ @@ -492,20 +532,6 @@ LOCAL_SRC_FILES := \ third_party/mbedtls/repo/library/x509write_crt.c \ third_party/mbedtls/repo/library/x509write_csr.c \ third_party/mbedtls/repo/library/xtea.c \ - third_party/tcplp/bsdtcp/tcp_usrreq.c \ - third_party/tcplp/bsdtcp/tcp_subr.c \ - third_party/tcplp/bsdtcp/tcp_output.c \ - third_party/tcplp/bsdtcp/cc/cc_newreno.c \ - third_party/tcplp/bsdtcp/tcp_reass.c \ - third_party/tcplp/bsdtcp/tcp_timewait.c \ - third_party/tcplp/bsdtcp/tcp_sack.c \ - third_party/tcplp/bsdtcp/tcp_input.c \ - third_party/tcplp/bsdtcp/tcp_timer.c \ - third_party/tcplp/lib/bitmap.c \ - third_party/tcplp/lib/cbuf.c \ - third_party/tcplp/lib/lbuf.c \ - $(OPENTHREAD_PROJECT_SRC_FILES) \ - $(NULL) include $(BUILD_STATIC_LIBRARY) @@ -598,7 +624,7 @@ LOCAL_SRC_FILES := \ src/posix/main.c \ $(NULL) -LOCAL_STATIC_LIBRARIES = libopenthread-cli ot-core +LOCAL_STATIC_LIBRARIES = libopenthread-cli ot-core libopenthread-mbedtls include $(BUILD_EXECUTABLE) ifeq ($(USE_OTBR_DAEMON), 1) diff --git a/script/check-android-build b/script/check-android-build index 6647b9f15..e76ea9f9f 100755 --- a/script/check-android-build +++ b/script/check-android-build @@ -55,8 +55,7 @@ check_datetime() EOF OPENTHREAD_PROJECT_CFLAGS="-I$PWD -DOPENTHREAD_CONFIG_FILE=\\\"openthread-config-datetime.h\\\" \ - -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\\\"openthread-core-posix-config.h\\\" \ - -std=c99" \ + -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\\\"openthread-core-posix-config.h\\\"" \ make showcommands ot-cli grep "$datetime" -ao "out/target/product/generic/system/bin/ot-cli" make clean-ot-cli