From 411dd4c88a27b2ec048d6de80ec44419c22d75be Mon Sep 17 00:00:00 2001
From: Raquel Medina <raquel.medina@konsulko.com>
Date: Thu, 28 Mar 2019 15:44:15 +0200
Subject: [PATCH] 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>
---
 .gitmodules                                     | 6 ------
 afb-helpers                                     | 1 -
 app/CMakeLists.txt                              | 2 +-
 {conf.d/autobuild => autobuild}/agl/autobuild   | 0
 {conf.d/autobuild => autobuild}/linux/autobuild | 2 +-
 5 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 afb-helpers
 rename {conf.d/autobuild => autobuild}/agl/autobuild (100%)
 rename {conf.d/autobuild => autobuild}/linux/autobuild (97%)

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
index 52f0478..0000000
--- a/afb-helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 52f04783535948f2782780992710276f3419e56e
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
similarity index 100%
rename from conf.d/autobuild/agl/autobuild
rename to autobuild/agl/autobuild
diff --git a/conf.d/autobuild/linux/autobuild b/autobuild/linux/autobuild
similarity index 97%
rename from conf.d/autobuild/linux/autobuild
rename to 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
-- 
2.16.6