From 5ec47f0f9ec2b85540930e8726a8664309398a18 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 26 Apr 2019 16:15:37 +0200 Subject: [PATCH] esp32: mark micro-ecc includes as private to avoid compile errors in other components --- port/esp32/components/btstack/component.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/port/esp32/components/btstack/component.mk b/port/esp32/components/btstack/component.mk index ef1b949cd..c2931b8bc 100644 --- a/port/esp32/components/btstack/component.mk +++ b/port/esp32/components/btstack/component.mk @@ -7,14 +7,14 @@ # please read the ESP-IDF documents if you need to do this. # -# micro-ecc of ESP32 tree was moved into components/bootloader/micro-ecc +# micro-ecc of ESP32 tree was moved into components/bootloader/micro-ecc in v3.3 +# we use our copy, but keep it private to not clash compiling the bootloader COMPONENT_ADD_INCLUDEDIRS := \ 3rd-party/bluedroid/decoder/include \ 3rd-party/bluedroid/encoder/include \ 3rd-party/hxcmod-player \ 3rd-party/hxcmod-player/mods \ - 3rd-party/micro-ecc \ 3rd-party/md5 \ 3rd-party/yxml \ src/classic \ @@ -26,6 +26,9 @@ COMPONENT_ADD_INCLUDEDIRS := \ platform/freertos \ include \ +COMPONENT_PRIV_INCLUDEDIRS := \ + 3rd-party/micro-ecc \ + COMPONENT_SRCDIRS := \ 3rd-party/bluedroid/decoder/srce \ 3rd-party/bluedroid/encoder/srce \