Skip to content

Commit 548f712

Browse files
authored
Fix empty libs being included with the builder (#2997)
1 parent 56ce580 commit 548f712

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+8
-4
lines changed

platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
3535

3636
compiler.c.elf.cmd=xtensa-esp32-elf-gcc
3737
compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u __cxa_guard_dummy -u __cxx_fatal_exception
38-
compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lesp-face -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lmdns -lvfs -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -lspiffs -lface_detection -lespnow -lnvs_flash -lesp_adc_cal -llog -ldl_lib -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd -lstdc++
38+
compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lmdns -lvfs -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -lspiffs -lface_detection -lespnow -lnvs_flash -lesp_adc_cal -llog -ldl_lib -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd -lstdc++
3939

4040
compiler.as.cmd=xtensa-esp32-elf-as
4141

tools/platformio-build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
],
166166

167167
LIBS=[
168-
"-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lesp-face", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lmdns", "-lvfs", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-lspiffs", "-lface_detection", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldl_lib", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
168+
"-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lmdns", "-lvfs", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-lspiffs", "-lface_detection", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldl_lib", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
169169
],
170170

171171
LIBSOURCE_DIRS=[

tools/sdk/bin/bootloader_qout_40m.bin

0 Bytes
Binary file not shown.

tools/sdk/include/esp-face/fr_forward.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ extern "C"
8989
dl_matrix3du_t *src,
9090
dl_matrix3du_t *dest);
9191

92+
/**
93+
* @brief Run the face recognition model to get the face feature
94+
*
95+
* @param aligned_face A 56x56x3 image, the variable need to do align_face first
96+
* @return face_id A 512 vector, size (1, 1, 1, 512)
97+
*/
9298
dl_matrix3d_t *get_face_id(dl_matrix3du_t *aligned_face);
9399

94100
/**
@@ -135,7 +141,6 @@ extern "C"
135141
uint8_t delete_face(face_id_list *l);
136142
int8_t delete_face_with_name(face_id_name_list *l, char *name);
137143
void delete_face_all_with_name(face_id_name_list *l);
138-
dl_matrix3d_t *get_face_id(dl_matrix3du_t *aligned_face);
139144
#if __cplusplus
140145
}
141146
#endif

tools/sdk/lib/libapp_trace.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libasio.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libbootloader_support.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libbt.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libcoap.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libconsole.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libcxx.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libdriver.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp-face.a

-1
This file was deleted.

tools/sdk/lib/libesp-tls.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp32-camera.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp32.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_adc_cal.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_event.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_http_client.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_http_server.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_https_ota.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_ringbuf.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libethernet.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libexpat.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libface_detection.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libface_recognition.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libfatfs.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libfb_gfx.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libfreemodbus.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libfreertos.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libheap.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libimage_util.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libjsmn.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libjson.a

0 Bytes
Binary file not shown.

tools/sdk/lib/liblibsodium.a

0 Bytes
Binary file not shown.

tools/sdk/lib/liblog.a

0 Bytes
Binary file not shown.

tools/sdk/lib/liblwip.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libmbedtls.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libmdns.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libmicro-ecc.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libmqtt.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libnewlib.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libnghttp.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libnvs_flash.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libopenssl.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libprotobuf-c.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libprotocomm.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libpthread.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libsdmmc.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libsmartconfig_ack.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libsoc.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libspi_flash.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libspiffs.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libtcp_transport.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libtcpip_adapter.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libulp.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libvfs.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libwear_levelling.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libwifi_provisioning.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libwpa_supplicant.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)