X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fapiv1-exec.go;h=5efef2a968025220a961136abce99333a60c692f;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=aea34e441f44d2501e028ea7a6e2b3955a9f0e64;hpb=5e979f0ba451e64fc44ffaa8b79d714d9ad75a57;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsserver/apiv1-exec.go b/lib/xdsserver/apiv1-exec.go
index aea34e4..5efef2a 100644
--- a/lib/xdsserver/apiv1-exec.go
+++ b/lib/xdsserver/apiv1-exec.go
@@ -26,9 +26,9 @@ import (
 	"strings"
 	"time"
 
-	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
-	"gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
-	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"github.com/gin-gonic/gin"
 	"github.com/kr/pty"
 )
@@ -83,6 +83,15 @@ func (s *APIService) execCmd(c *gin.Context) {
 
 	// Build command line
 	cmd := []string{}
+
+	// Reset by default LD_LIBRARY_PATH
+	// With new AGL SDK, New environment-setup-*-agl-linux file checks if
+	// LD_LIBRARY_PATH is set or not and not empty LD_LIBRARY_PATH is considered
+	// as misconfigured and prevent to use SDK
+	if !args.LdLibPathNoReset {
+		cmd = append(cmd, "unset LD_LIBRARY_PATH; ")
+	}
+
 	// Setup env var regarding Sdk ID (used for example to setup cross toolchain)
 	if envCmd := s.sdks.GetEnvCmd(args.SdkID, prj.DefaultSdk); len(envCmd) > 0 {
 		cmd = append(cmd, envCmd...)