diff options
| author |   Raquel Medina <raquel.medina@konsulko.com> | 2019-03-28 15:44:15 +0200 |
|---|---|---|
| committer | Raquel Medina <raquel.medina@konsulko.com> | 2019-03-28 16:46:24 +0200 |
| commit | 411dd4c88a27b2ec048d6de80ec44419c22d75be (patch) | |
| tree | 50e06cce0336a290c00bc64b6fd48560040520df | |
| parent | 4ada6248406bc3d7795fc4b5f0f5752583504c08 (diff) | |
fix warnings by relocating autobuild scripts
- move autobuild scripts to top dir
- remove submodules and update app/CMakeLists.txt
to use libafb-helpers-qt instead.
Bug-AGL: SPEC-2164
Change-Id: I9bf25a158d4eeba16ffb5555c8ca257cd81259f4
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | afb-helpers | 0 | ||||
| -rw-r--r-- | app/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | autobuild/agl/autobuild (renamed from conf.d/autobuild/agl/autobuild) | 0 | ||||
| -rwxr-xr-x | autobuild/linux/autobuild (renamed from conf.d/autobuild/linux/autobuild) | 2 |
5 files changed, 2 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index af9d4e3..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "conf.d/app-templates"] - path = conf.d/app-templates - url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git -[submodule "afb-helpers"] - path = afb-helpers - url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule diff --git a/afb-helpers b/afb-helpers deleted file mode 160000 -Subproject 52f04783535948f2782780992710276f3419e56 diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 5317224..e08a102 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -52,7 +52,7 @@ target_link_libraries(mixer Qt5::AGLExtras Qt5::WebSockets json-c - afb-helpers + libafb-helpers-qt.a ) if(NOT NATIVE_BUILD) diff --git a/conf.d/autobuild/agl/autobuild b/autobuild/agl/autobuild index 883293d..883293d 100755 --- a/conf.d/autobuild/agl/autobuild +++ b/autobuild/agl/autobuild diff --git a/conf.d/autobuild/linux/autobuild b/autobuild/linux/autobuild index 3a1ba5f..035db15 100755 --- a/conf.d/autobuild/linux/autobuild +++ b/autobuild/linux/autobuild @@ -15,7 +15,7 @@ # limitations under the License. THISFILE := $(lastword $(MAKEFILE_LIST)) -BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) +BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build) DEST := ${BUILD_DIR}/target .PHONY: all clean distclean configure build package help update |