Update copy-libs.sh

Author: Jason2866

tools/copy-libs.sh

@@ -370,7 +370,7 @@ cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
 
 # Process include directories and implement include path shortening
 # This is equivalent to the Python shorthen_includes() function
-# We collect shortened include paths and copy all header files to the SDK
+# We collect shortened include paths and copy all header files to the esp32-arduino-libs
 REL_INC=""    # Will contain the shortened include paths
 set -- $INCLUDES
 
@@ -409,7 +409,7 @@ for item; do
 		# Add to shortened include paths (using GCC's -iwithprefix mechanism)
 		REL_INC+="-iwithprefixbefore $fname$out_sub "
 
-		# Copy all header files to the SDK include directory
+		# Copy all header files to the esp32-arduino-libs include directory
 		# This ensures all headers are available at build time
 		for f in `find "$item" -name '*.h'`; do
 			rel_f=${f#*$item}
@@ -449,18 +449,18 @@ else
 	echo "        \"-march=rv32imc\"," >> "$AR_PLATFORMIO_PY"  # RISC-V architecture
 fi
 
-# Add shortened include paths for assembly files
+# Add shortened include paths for assembly files using esp32-arduino-libs structure
 # This implements the same logic as the Python shorthen_includes() function
 if [[ -n "$REL_INC" ]]; then
-    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"esp32-arduino-libs\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"esp32-arduino-libs\", \"$IDF_TARGET\", \"include\")," >> "$AR_PLATFORMIO_PY"
     # Parse the REL_INC string and convert -iwithprefixbefore to -iwithprefix
     IFS=' ' read -ra rel_inc_array <<< "$REL_INC"
     i=0
     while [ $i -lt ${#rel_inc_array[@]} ]; do
         if [[ "${rel_inc_array[$i]}" == "-iwithprefixbefore" ]]; then
             if [ $((i+1)) -lt ${#rel_inc_array[@]} ]; then
                 path="${rel_inc_array[$((i+1))]}"
-                echo "        \"-iwithprefix/include/$path\"," >> "$AR_PLATFORMIO_PY"
+                echo "        \"-iwithprefix/$path\"," >> "$AR_PLATFORMIO_PY"
                 i=$((i+2))    # Skip both flag and path
             else
                 i=$((i+1))
@@ -517,17 +517,17 @@ for item; do
 	echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
 done
 
-# Add shortened include paths for C/C++ compilation
+# Add shortened include paths for C/C++ compilation using esp32-arduino-libs structure
 # This is the core of the include path shortening mechanism
 if [[ -n "$REL_INC" ]]; then
-    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"esp32-arduino-libs\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"esp32-arduino-libs\", \"$IDF_TARGET\", \"include\")," >> "$AR_PLATFORMIO_PY"
     IFS=' ' read -ra rel_inc_array <<< "$REL_INC"
     i=0
     while [ $i -lt ${#rel_inc_array[@]} ]; do
         if [[ "${rel_inc_array[$i]}" == "-iwithprefixbefore" ]]; then
             if [ $((i+1)) -lt ${#rel_inc_array[@]} ]; then
                 path="${rel_inc_array[$((i+1))]}"
-                echo "        \"-iwithprefix/include/$path\"," >> "$AR_PLATFORMIO_PY"
+                echo "        \"-iwithprefix/$path\"," >> "$AR_PLATFORMIO_PY"
                 i=$((i+2))
             else
                 i=$((i+1))
@@ -586,8 +586,8 @@ for item; do
 	PIO_LIBS+="\"$item\""
 done
 
-# Strip debug symbols from libraries and copy them to SDK
-# This reduces the size of the final SDK package
+# Strip debug symbols from libraries and copy them to esp32-arduino-libs
+# This reduces the size of the final esp32-arduino-libs package
 set -- $LD_LIB_FILES
 for item; do
 	"$TOOLCHAIN-strip" -g "$item"    # Remove debug symbols
@@ -683,7 +683,7 @@ for item; do
 	done
 done
 
-# Strip debug symbols from specific large libraries to reduce SDK size
+# Strip debug symbols from specific large libraries to reduce esp32-arduino-libs size
 for lib in "openthread" "espressif__esp-tflite-micro" "bt" "espressif__esp_modem" "espressif__esp-zboss-lib" "espressif__esp-zigbee-lib" "espressif__mdns" "espressif__esp-dsp" "espressif__esp32-camera" "joltwallet__littlefs"; do
 	if [ -f "$AR_SDK/lib/lib$lib.a" ]; then
 		echo "Stripping $AR_SDK/lib/lib$lib.a"