diff --git a/.gitignore b/.gitignore index a3ae50da..0cf0b570 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,6 @@ bin/* pkg/* vendor/src doc/generate-api/* -3rdparty/ -go/ vendor/ glide.lock diff --git a/Makefile b/Makefile index 5eab21cc..347051aa 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,6 @@ endif # Go 3rdParty packages BUILD_VENDOR_DIR := $(BASE_DIR)/vendor -BUILD_GO_DIR := $(BASE_DIR)/go GLIDE_LOCK_FILE := $(BASE_DIR)/glide.lock # Go Library for android @@ -82,7 +81,6 @@ build-result: clean-tmp-packages: -rm -rf $(BUILD_VENDOR_DIR) -rm -rf $(GLIDE_LOCK_FILE) - -rm -rf $(BUILD_GO_DIR) ## edge-orchestration android library build build-object-java: diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index 982e3115..7ce3d9c9 --- a/build.sh +++ b/build.sh @@ -98,9 +98,6 @@ function install_prerequisite() { echo "-----------------------------------" echo " Install prerequisite packages" echo "-----------------------------------" - mkdir $BASE_DIR/go - export GOPATH=$BASE_DIR/go - pkg_list=( "github.com/axw/gocov/gocov" "github.com/matm/gocov-html" @@ -120,12 +117,6 @@ function install_prerequisite() { echo ": Done" idx=$((idx+1)) done - - # Rebase gomobile [ Needed due to issues in latest gomobile ] - cd $BASE_DIR/go/src/golang.org/x/mobile - git reset --hard 30c70e3810e97d051f18b66d59ae242540c0c391 - go install ./cmd/... - cd $BASE_DIR } function build_clean() {