Skip to content

Commit

Permalink
Merge pull request #69 from wansuyoo/remove_gomobile_rebase
Browse files Browse the repository at this point in the history
remove gomobile rebase
  • Loading branch information
mgjeong committed Oct 24, 2019
2 parents 974239a + 72311e5 commit 7673ba6
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ bin/*
pkg/*
vendor/src
doc/generate-api/*
3rdparty/
go/
vendor/
glide.lock

Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions build.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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() {
Expand Down

0 comments on commit 7673ba6

Please sign in to comment.