[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/build/scripts/build_env_mini/Makefile b/ap/build/scripts/build_env_mini/Makefile
index 9a9a0e9..167ceb1 100755
--- a/ap/build/scripts/build_env_mini/Makefile
+++ b/ap/build/scripts/build_env_mini/Makefile
@@ -122,5 +122,5 @@
mkdir -p $(PRJ_BIN_DIR)/allbins $(PRJ_BIN_DIR)/elfs/normalelfs
cp -v $(IMAGE_DIR)/rootfs.img $(PRJ_BIN_DIR)/allbins/ap_rootfs.img
find $(APP_DIR)/ -name *.elf -exec cp {} $(PRJ_BIN_DIR)/elfs/normalelfs \;
- find $(LIB_DIR)/ -type f -name "lib*.so" -exec cp {} $(PRJ_BIN_DIR)/elfs/normalelfs \;
- find $(STAGEDIR)/uClibc/lib -type f -name "*.so" -exec cp {} $(PRJ_BIN_DIR)/elfs/normalelfs \;
+ find $(LIB_DIR)/ -name "l*.so*" -type f ! -path "*/.libs/*" -exec cp {} $(PRJ_BIN_DIR)/elfs/normalelfs \;
+ find $(STAGEDIR)/libc/lib -type f -name "*.so*" -exec cp {} $(PRJ_BIN_DIR)/elfs/normalelfs \;
diff --git a/ap/build/scripts/build_env_mini/build_env_mini.sh b/ap/build/scripts/build_env_mini/build_env_mini.sh
index 23ba23f..d2c4495 100755
--- a/ap/build/scripts/build_env_mini/build_env_mini.sh
+++ b/ap/build/scripts/build_env_mini/build_env_mini.sh
@@ -19,7 +19,9 @@
#±àÒëÁ´
mkdir -p $CROSS_DIR/build/compiler/gcc-4.9.4_thumb_linux/
+mkdir -p $CROSS_DIR/build/utils/
$RSYNC_OPT ./build/compiler/gcc-4.9.4_thumb_linux/ $CROSS_DIR/build/compiler/gcc-4.9.4_thumb_linux/
+$RSYNC_OPT ./build/utils/ $CROSS_DIR/build/utils/
#libc
mkdir -p $CROSS_DIR/ap/staging/
@@ -60,8 +62,8 @@
cp -v $CROSS_DIR/ap/project/zx297520v3/$PRJ_NAME/config/normal/config_app.mk $CROSS_DIR/ap/app/
-cp -v ./ap/build/scripts/build_env_mini/Makefile $CROSS_DIR/ap/
-cp -v ./ap/build/scripts/build_env_mini/readme.txt $CROSS_DIR/
+cp -v ./ap2/build/scripts/build_env_mini/Makefile $CROSS_DIR/ap/
+cp -v ./ap2/build/scripts/build_env_mini/readme.txt $CROSS_DIR/
#clean
rm -fr $CROSS_DIR/ap/project/zx297520v3/$PRJ_NAME/fs/normal/rootfs/*