From b21ea2f10b6ddad423f455dc0bf03ea786720450 Mon Sep 17 00:00:00 2001
From: Shi Lei <50089527+lucshi@users.noreply.github.com>
Date: Mon, 23 Mar 2020 12:05:25 +0800
Subject: [PATCH] Fixed a bug in simple project building when passing "-p
 profile" as argument to build.sh; add two more 3rd party folders into
 git.ignore to avoid merge failure (#209)

* add 3rd party folders which are downloaded during building into git ignore configuration file.

Change-Id: I5a5d913b701bcf6889d89706df65a22c366e24af

Co-authored-by: luc <luc@luc-ubuntu19.bj.intel.com>
---
 .gitignore              | 2 ++
 samples/simple/build.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0bb638f42..16466f94c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 **/*build/
 core/deps/lv_drivers
 core/deps/llvm
+core/deps/lvgl
+core/shared/mem-alloc/tlsf
\ No newline at end of file
diff --git a/samples/simple/build.sh b/samples/simple/build.sh
index 27b610f8f..85f306774 100755
--- a/samples/simple/build.sh
+++ b/samples/simple/build.sh
@@ -100,7 +100,7 @@ PROFILE="simple-$PROFILE"
 
 echo "#####################build wamr sdk"
 cd ${WAMR_DIR}/wamr-sdk
-./build_sdk.sh -n $PROFILE -x $SDK_CONFIG_FILE $ARG_TOOLCHAIN $*
+./build_sdk.sh -n $PROFILE -x $SDK_CONFIG_FILE $ARG_TOOLCHAIN
 [ $? -eq 0 ] || exit $?