reader: move vdl files into common/vdl
This CL moves the vdl files from vdl/ to common/vdl.
Build scripts are also updated accordingly.
Change-Id: I490ab8c78e52f8395978bfc866a6e79b60baa731
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e4d7fdf..42e6601 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -78,6 +78,6 @@
vdl {
inputPaths += System.getenv("JIRI_ROOT") + '/release/go/src'
- inputPaths += '../..'
+ inputPaths += new File(projectDir, '../../common').canonicalPath
packageTranslations += 'vdl->io.v.android.apps.reader.vdl'
}
diff --git a/vdl/device-set.vdl b/common/vdl/device-set.vdl
similarity index 100%
rename from vdl/device-set.vdl
rename to common/vdl/device-set.vdl
diff --git a/vdl/device.vdl b/common/vdl/device.vdl
similarity index 100%
rename from vdl/device.vdl
rename to common/vdl/device.vdl
diff --git a/vdl/error.vdl b/common/vdl/error.vdl
similarity index 100%
rename from vdl/error.vdl
rename to common/vdl/error.vdl
diff --git a/vdl/file.vdl b/common/vdl/file.vdl
similarity index 100%
rename from vdl/file.vdl
rename to common/vdl/file.vdl
diff --git a/web/Makefile b/web/Makefile
index 77915e8..7b4f623 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -3,7 +3,7 @@
NODE_DIR := $(shell jiri v23-profile list --info Target.InstallationDir nodejs)
PATH := $(PATH):$(NODE_DIR)/bin
SHELL := /bin/bash
-VDLPATH := $(JIRI_ROOT)/release/go/src:$(shell cd ..; pwd)
+VDLPATH := $(JIRI_ROOT)/release/go/src:$(shell cd ../common; pwd)
.SHELLFLAGS := -eu -o pipefail -c
.DEFAULT_GOAL := all
@@ -11,7 +11,7 @@
js_files := $(shell find browser -name "*.js")
css_files := $(shell find browser -name "*.css")
-vdl_files := $(wildcard ../vdl/*.vdl)
+vdl_files := $(wildcard ../common/vdl/*.vdl)
host ?= 127.0.0.1
port ?= 8080
