From: Riku Nomoto <riku_nomoto@mail.toyota.co.jp>
Date: Thu, 17 Dec 2020 15:38:34 +0000 (+0900)
Subject: Changed the path of agl.mk in the Makefile for each service.
X-Git-Tag: 10.92.0~10
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=34d32dbb0cea889f1091b9e73329841dbb578ef9;p=staging%2Fbasesystem.git

Changed the path of agl.mk in the Makefile for each service.

Changed the location of agl.mk from sysroot to src folder.
Therefore, the Yocto recipes need to change the S and subpath.

Signed-off-by: Riku Nomoto <riku_nomoto@mail.toyota.co.jp>
Change-Id: If0c6da774faf82237acbeb1f7d33f4dbc2858906
---

diff --git a/hal/can_hal/can_hal.mk b/hal/can_hal/can_hal.mk
index 546d6ad..0985743 100755
--- a/hal/can_hal/can_hal.mk
+++ b/hal/can_hal/can_hal.mk
@@ -35,5 +35,4 @@ COMPONENT_LDLIBS :=
 COMPONENT_LDFLAGS :=
 
 ##############################################################
-
-include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
+include $(CURRENT_DIR)/../../agl-basefiles/share/agl.mk
diff --git a/service/native/native_service.mk b/service/native/native_service.mk
index 74daaf0..3c0fd92 100755
--- a/service/native/native_service.mk
+++ b/service/native/native_service.mk
@@ -41,4 +41,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
+include $(CURRENT_DIR)/../../agl-basefiles/share/agl.mk
diff --git a/service/other/other_service.mk b/service/other/other_service.mk
index 63a03ab..e83aa10 100755
--- a/service/other/other_service.mk
+++ b/service/other/other_service.mk
@@ -39,4 +39,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
+include $(CURRENT_DIR)/../../agl-basefiles/share/agl.mk
diff --git a/service/peripheral/peripheral_service.mk b/service/peripheral/peripheral_service.mk
index 561c241..a573f92 100755
--- a/service/peripheral/peripheral_service.mk
+++ b/service/peripheral/peripheral_service.mk
@@ -41,4 +41,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
+include $(CURRENT_DIR)/../../agl-basefiles/share/agl.mk
diff --git a/service/system/system_service.mk b/service/system/system_service.mk
index c1aa32c..fd33c6d 100755
--- a/service/system/system_service.mk
+++ b/service/system/system_service.mk
@@ -41,4 +41,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
+include $(CURRENT_DIR)/../../agl-basefiles/share/agl.mk
diff --git a/service/vehicle/vehicle_service.mk b/service/vehicle/vehicle_service.mk
index 8e753fb..bf1cebb 100755
--- a/service/vehicle/vehicle_service.mk
+++ b/service/vehicle/vehicle_service.mk
@@ -39,4 +39,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
+include $(CURRENT_DIR)/../../agl-basefiles/share/agl.mk
diff --git a/stub/stub.mk b/stub/stub.mk
index b938c6d..860f66d 100755
--- a/stub/stub.mk
+++ b/stub/stub.mk
@@ -38,5 +38,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
-
+include $(CURRENT_DIR)/../agl-basefiles/share/agl.mk