v.io/devtools: start to use new-style profiles.
See v.io/c/15780
MultiPart: 4/6
Change-Id: I8e31912614149d312b6d77990bd1252015d31ec3
diff --git a/extension/Makefile b/extension/Makefile
index 4c6f602..fccba57 100644
--- a/extension/Makefile
+++ b/extension/Makefile
@@ -17,7 +17,18 @@
define COMPILE-NACL-PLUGIN
mkdir -p $(dir $2)
- GOROOT= JIRI_PROFILE=nacl jiri go build -o $2 $1
+ nacl=$(shell jiri xprofile list nacl)
+ if [ ! -z "$(nacl)" ]; then \
+ echo ">>>>>>> new nacl profile installed"; \
+ fi
+ if [ -f "$(JIRI_ROOT)/.jiri_xprofiles" -a ! -z "$(nacl)" ]; then \
+ echo ">>>>>>> using new profiles"; \
+ echo ""; \
+ jiri go --target=nacl build -o $2 $1; \
+ else \
+ echo ">>>>>>> using old profiles"; \
+ GOROOT= JIRI_PROFILE=nacl jiri go build -o $2 $1; \
+ fi
endef
all: vanadium.zip
diff --git a/go/src/v.io/x/js.core/test_service/test_serviced/cache_impl.go b/go/src/v.io/x/js.core/test_service/test_serviced/cache_impl.go
index a716b3b..7c7c59e 100644
--- a/go/src/v.io/x/js.core/test_service/test_serviced/cache_impl.go
+++ b/go/src/v.io/x/js.core/test_service/test_serviced/cache_impl.go
@@ -5,10 +5,10 @@
package main
import (
- "sync"
"fmt"
"reflect"
"sort"
+ "sync"
"time"
"v.io/v23/context"
