diff options
| author |   Riku Nomoto <riku_nomoto@mail.toyota.co.jp> | 2020-11-21 13:28:24 +0900 |
|---|---|---|
| committer | Riku Nomoto <riku_nomoto@mail.toyota.co.jp> | 2020-11-21 13:28:24 +0900 |
| commit | 89f8e4221d4397bc786c595c9da687382d40c16c (patch) | |
| tree | 2aa12cce01dbaf64fa811084b8bfdd460fa67f8e | |
| parent | 2219d0168f8f8418aee784a7542388ef064fa833 (diff) | |
Fix build errors due to changing the pathsandbox/Riku.Nomoto/build
Replaced from /usr/agl/ to B /usr/
Signed-off-by: Riku Nomoto <riku_nomoto@mail.toyota.co.jp>
Change-Id: I16f8a96ef7f128691c791f7316830097914bb33f
105 files changed, 349 insertions, 349 deletions
diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk index 77d4512..94bf036 100644 --- a/agl-basefiles/share/agl.mk +++ b/agl-basefiles/share/agl.mk @@ -86,7 +86,7 @@ DESTDIR ?= $(SDKTARGETSYSROOT) WARN_FLAGS ?= -Wall DEBUG_FLAGS ?= -g -AUTO_INCLUDE := -include $(SYSROOT)/usr/agl/include/agl_types_obsoluted.h +AUTO_INCLUDE := -include $(SYSROOT)/usr/include/agl_types_obsoluted.h AGLCFLAGS := $(CFLAGS) $(COMPONENT_CFLAGS) AGLCXXFLAGS := $(CXXFLAGS) $(COMPONENT_CXXFLAGS) AGLCPPFLAGS := $(CPPFLAGS) $(COMPONENT_CPPFLAGS) @@ -200,10 +200,10 @@ AGLCPPFLAGS += -D_GNU_SOURCE AGLCPPFLAGS += -DAGL_PosixBasedOS001LEGACY_USED -DAGL_STUB -DLINUX ## for agl header## -AGLCPPFLAGS += -I$(SYSROOT)/usr/agl/include +AGLCPPFLAGS += -I$(SYSROOT)/usr/include ## for agl library## -AGLLDFLAGS += -L$(SYSROOT)/usr/agl/lib +AGLLDFLAGS += -L$(SYSROOT)/usr/lib ifneq ($(INST_SHLIBS),libagl_stub) AGLLDLIBS += -Wl,-Bdynamic -lpthread @@ -331,7 +331,7 @@ endif ################################################################################# -RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/agl/lib +RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib ################################################################################# SUBDIRS := $(filter-out mock,$(SUBDIRS)) @@ -399,7 +399,7 @@ build-arlib: $(INST_LIBS:%=%.a) $(NOINST_LIBS:%=%.a) TOPDIR=$(abspath ./) generate-header-list: install-header-local echo $(COMPONENT_NAME) > $(addsuffix .list, $(abspath ./)) - ls -1 $(TOPDIR)/tmp_head/usr/agl/include/$(COMPONENT_NAME)/ >> $(addsuffix .list, $(abspath ./)) + ls -1 $(TOPDIR)/tmp_head/usr/include/$(COMPONENT_NAME)/ >> $(addsuffix .list, $(abspath ./)) rm -rf ./tmp_head @@ -444,8 +444,8 @@ ifneq ($(strip $(INST_HEADERS)),) endif -HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/launch_xml2cfg.sh -CONF_H = $(SYSROOT)/usr/agl/include/sm_launch_conf.h +HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/share/launch_xml2cfg.sh +CONF_H = $(SYSROOT)/usr/include/sm_launch_conf.h %.cfg: %.xml set -e; \ diff --git a/agl-systemd/env.txt b/agl-systemd/env.txt index 48b83df..f784b5e 100755 --- a/agl-systemd/env.txt +++ b/agl-systemd/env.txt @@ -7,9 +7,9 @@ TERM="xterm" INIT_UID="1000" INIT_GID="1000" AGL_RWDATA_PATH="/nv" -LD_LIBRARY_PATH="/lib:/usr/lib:/usr/agl/lib:/usr/debug/lib" +LD_LIBRARY_PATH="/lib:/usr/lib:/usr/lib:/usr/debug/lib" ARB_OPT="FORCE_REBOOT" -PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/agl/bin:/usr/debug/bin:/usr/debug/sbin:/usr/debug/usr/bin:/usr/debug/usr/sbin" +PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/bin:/usr/debug/bin:/usr/debug/sbin:/usr/debug/usr/bin:/usr/debug/usr/sbin" PWD="/dev/mqueue" OLDPWD="/dev/mqueue" SHLVL="1" diff --git a/agl-systemd/tool_9E_SI/launch_sm.sh b/agl-systemd/tool_9E_SI/launch_sm.sh index ed1e8d1..da9cf23 100755 --- a/agl-systemd/tool_9E_SI/launch_sm.sh +++ b/agl-systemd/tool_9E_SI/launch_sm.sh @@ -19,8 +19,8 @@ export APPS_CONFIG_FILENAME=sm_launch.cfg export SM_CONFIG_DATA_FILENAME=gpf_ss_sm_config_data.cfg export XDG_RUNTIME_DIR=/run/user/0 -cd /usr/agl/bin/ +cd /usr/bin/ rm -rf /nv/romaccess rm /dev/shm/lockfile -/usr/agl/bin/SS_SystemManager & +/usr/bin/SS_SystemManager & diff --git a/agl-systemd/tool_9E_SI/setup_refhw.sh b/agl-systemd/tool_9E_SI/setup_refhw.sh index e3f33a4..6041140 100755 --- a/agl-systemd/tool_9E_SI/setup_refhw.sh +++ b/agl-systemd/tool_9E_SI/setup_refhw.sh @@ -29,7 +29,7 @@ echo "AREA=$VEHICLEPARAMETERLIBRARY_AREA" >> /tmp/udev_device.env # Start: Workaround for release ############################################### ## Sprint 29 To make WebService can update contents. -#chown -R agl:agl /usr/agl/data/electronicom +#chown -R agl:agl /usr/data/electronicom ## For btservice initial data. #chown -R agl:agl /nv/backup/D_BK_CA_BT_MANAGEMENT ## Sprint 29 PFDRECThread @@ -40,7 +40,7 @@ restorecon -R /ramd ## Sprint 29 communication #chmod -R 777 /home/root/.app_can_d # TODO:for bluetooth_service -#chmod 777 /usr/agl/share +#chmod 777 /usr/share #if `df -T / | grep nfs > /dev/null`; then #cp /sbin/insmod.kmod /tmp/insmod.kmod diff --git a/agl-systemd/usr/target/agl_cap.lst b/agl-systemd/usr/target/agl_cap.lst index 89ea096..306f8b0 100755 --- a/agl-systemd/usr/target/agl_cap.lst +++ b/agl-systemd/usr/target/agl_cap.lst @@ -1,34 +1,34 @@ -/usr/agl/bin/SS_SystemManager|||cap_sys_nice,cap_setuid,cap_setgid,cap_sys_resource+ep|y -/usr/agl/bin/tskmgr|||cap_sys_nice,cap_setuid,cap_setgid=ep|y -/usr/agl/bin/SS_DeviceDetectionService|||cap_setuid,cap_setgid,cap_sys_resource,cap_dac_override,cap_sys_admin+ep|y -/usr/agl/bin/communication|||cap_dac_override+ep|y -/usr/agl/bin/AS_AudioManager|||cap_sys_nice+ep|y -/usr/agl/bin/acmsrv|||cap_dac_override,cap_sys_admin,cap_sys_nice,cap_sys_resource,cap_chown,cap_fowner,cap_setgid,cap_setuid,cap_kill+ep|y -/usr/agl/bin/PS_SwitchHandler|||cap_sys_admin,cap_dac_override+ep|y -/usr/agl/bin/LockManager|||cap_kill+ep|y -/usr/agl/bin/nandupdate|||cap_dac_override+ep|y -/usr/agl/bin/wlan_controller|||cap_net_raw,cap_net_admin+ep|y -/usr/agl/bin/DummyRead|||cap_dac_read_search+ep|y -/usr/agl/bin/clock|||cap_sys_time+ep|y -/usr/agl/bin/Mounter|||cap_sys_admin,cap_dac_override+ep|y -/usr/agl/bin/MounterEx|||cap_sys_admin,cap_fowner,cap_dac_override,cap_chown+ep|y -/usr/agl/bin/DevReproService|||cap_chown,cap_fowner,cap_dac_override+ep|y -/usr/agl/bin/PS_CDR|||cap_sys_admin+ep|y -/usr/agl/bin/webdavmgr|||cap_net_admin,cap_net_raw+ep|y -/usr/agl/bin/DiagService|||cap_sys_rawio,cap_dac_override+ep|y -/usr/agl/bin/resm|||cap_setuid+ep|y -/usr/agl/bin/SS_LoggerService|||cap_dac_override+ep|y -/usr/agl/bin/NetworkManager|||cap_setuid,cap_setgid,cap_sys_admin,cap_chown,cap_kill,cap_net_raw,cap_net_admin,cap_net_bind_service+ep|y -/usr/agl/bin/RadioService|||cap_sys_nice+ep|y -/usr/agl/bin/ASND_VProxy|||cap_sys_nice+ep|y -/usr/agl/bin/misink|||cap_sys_nice+ep|y -/usr/agl/bin/mlink|||cap_sys_nice+ep|y -/usr/agl/bin/media_service|||cap_dac_override,cap_sys_nice+ep|y -/usr/agl/bin/_CWORD74__service|||cap_dac_override+ep|y -/usr/agl/bin/PlaybackService|||cap_sys_nice+ep|y -/usr/agl/bin/Positioning|||cap_dac_override+ep|y -/usr/agl/bin/vehicle|||cap_dac_override+ep|y -/usr/agl/bin/bluetooth_srv|||cap_dac_override,cap_sys_nice+ep|y -/usr/agl/bin/btd_srv|||cap_dac_override,cap_sys_nice+ep|y -/usr/agl/bin/NS_BackupMgr|||cap_dac_override+ep|y -/usr/agl/bin/Sound|||cap_dac_override+ep|y +/usr/bin/SS_SystemManager|||cap_sys_nice,cap_setuid,cap_setgid,cap_sys_resource+ep|y +/usr/bin/tskmgr|||cap_sys_nice,cap_setuid,cap_setgid=ep|y +/usr/bin/SS_DeviceDetectionService|||cap_setuid,cap_setgid,cap_sys_resource,cap_dac_override,cap_sys_admin+ep|y +/usr/bin/communication|||cap_dac_override+ep|y +/usr/bin/AS_AudioManager|||cap_sys_nice+ep|y +/usr/bin/acmsrv|||cap_dac_override,cap_sys_admin,cap_sys_nice,cap_sys_resource,cap_chown,cap_fowner,cap_setgid,cap_setuid,cap_kill+ep|y +/usr/bin/PS_SwitchHandler|||cap_sys_admin,cap_dac_override+ep|y +/usr/bin/LockManager|||cap_kill+ep|y +/usr/bin/nandupdate|||cap_dac_override+ep|y +/usr/bin/wlan_controller|||cap_net_raw,cap_net_admin+ep|y +/usr/bin/DummyRead|||cap_dac_read_search+ep|y +/usr/bin/clock|||cap_sys_time+ep|y +/usr/bin/Mounter|||cap_sys_admin,cap_dac_override+ep|y +/usr/bin/MounterEx|||cap_sys_admin,cap_fowner,cap_dac_override,cap_chown+ep|y +/usr/bin/DevReproService|||cap_chown,cap_fowner,cap_dac_override+ep|y +/usr/bin/PS_CDR|||cap_sys_admin+ep|y +/usr/bin/webdavmgr|||cap_net_admin,cap_net_raw+ep|y +/usr/bin/DiagService|||cap_sys_rawio,cap_dac_override+ep|y +/usr/bin/resm|||cap_setuid+ep|y +/usr/bin/SS_LoggerService|||cap_dac_override+ep|y +/usr/bin/NetworkManager|||cap_setuid,cap_setgid,cap_sys_admin,cap_chown,cap_kill,cap_net_raw,cap_net_admin,cap_net_bind_service+ep|y +/usr/bin/RadioService|||cap_sys_nice+ep|y +/usr/bin/ASND_VProxy|||cap_sys_nice+ep|y +/usr/bin/misink|||cap_sys_nice+ep|y +/usr/bin/mlink|||cap_sys_nice+ep|y +/usr/bin/media_service|||cap_dac_override,cap_sys_nice+ep|y +/usr/bin/_CWORD74__service|||cap_dac_override+ep|y +/usr/bin/PlaybackService|||cap_sys_nice+ep|y +/usr/bin/Positioning|||cap_dac_override+ep|y +/usr/bin/vehicle|||cap_dac_override+ep|y +/usr/bin/bluetooth_srv|||cap_dac_override,cap_sys_nice+ep|y +/usr/bin/btd_srv|||cap_dac_override,cap_sys_nice+ep|y +/usr/bin/NS_BackupMgr|||cap_dac_override+ep|y +/usr/bin/Sound|||cap_dac_override+ep|y diff --git a/boot_hal/Makefile b/boot_hal/Makefile index d184316..9349d2a 100755 --- a/boot_hal/Makefile +++ b/boot_hal/Makefile @@ -22,14 +22,14 @@ HEADER := hal_api/boot_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined diff --git a/can_hal/can_hal.mk b/can_hal/can_hal.mk index 19a824d..4fa3a77 100755 --- a/can_hal/can_hal.mk +++ b/can_hal/can_hal.mk @@ -36,4 +36,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/can_hal/src/Makefile b/can_hal/src/Makefile index f34eb75..8a99bcc 100755 --- a/can_hal/src/Makefile +++ b/can_hal/src/Makefile @@ -38,9 +38,9 @@ LDFLAGS += -shared LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib -RPATH := /usr/lib:/usr/agl/lib +RPATH := /usr/lib:/usr/lib ######### linked library ######################## LDLIBS += -Wl,-Bdynamic -lstdc++ diff --git a/clock_hal/Makefile b/clock_hal/Makefile index e417a15..11932be 100755 --- a/clock_hal/Makefile +++ b/clock_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/clock_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -33,7 +33,7 @@ CXXFLAGS += -DAGL_REFHW LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/deck_hal/Makefile b/deck_hal/Makefile index fbe4ddf..3c9580c 100755 --- a/deck_hal/Makefile +++ b/deck_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/deck_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := /usr/lib diff --git a/input_hal/Makefile b/input_hal/Makefile index 35dfefd..abf31c0 100755 --- a/input_hal/Makefile +++ b/input_hal/Makefile @@ -24,9 +24,9 @@ HEADER := ./hal_api/input_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/libdrm -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -36,7 +36,7 @@ CXXFLAGS += -D_USE_DRM LDFLAGS := -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib ######### linked library ######################## LIBS := -Wl,-Bdynamic -lstdc++ @@ -76,6 +76,6 @@ install: @echo $@ done. install-input: - install -m 0755 -d $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ - install -m 0644 ./hal_api/$(COMPONENT_NAME)/aglinput.h $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ - install -m 0644 ./hal_api/$(COMPONENT_NAME)/extinput.h $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ + install -m 0755 -d $(DESTDIR)/usr/include/$(COMPONENT_NAME)/ + install -m 0644 ./hal_api/$(COMPONENT_NAME)/aglinput.h $(DESTDIR)/usr/include/$(COMPONENT_NAME)/ + install -m 0644 ./hal_api/$(COMPONENT_NAME)/extinput.h $(DESTDIR)/usr/include/$(COMPONENT_NAME)/ diff --git a/nsframework/backup_manager/config/Makefile b/nsframework/backup_manager/config/Makefile index b307a66..b27741e 100755 --- a/nsframework/backup_manager/config/Makefile +++ b/nsframework/backup_manager/config/Makefile @@ -37,6 +37,6 @@ $(ID_HEADER): $(XML_PATH)/$(ALL_XML) CLEAN_FILES := $(ID_HEADER) install: $(XML_PATH)/$(BACKUP_XML) - install -m 0755 -d $(DESTDIR)/usr/agl/conf/BS/ns/backup_manager/rodata - install -m 0644 $(XML_PATH)/$(BACKUP_XML) $(DESTDIR)/usr/agl/conf/BS/ns/backup_manager/rodata/ + install -m 0755 -d $(DESTDIR)/usr/conf/BS/ns/backup_manager/rodata + install -m 0644 $(XML_PATH)/$(BACKUP_XML) $(DESTDIR)/usr/conf/BS/ns/backup_manager/rodata/ include ../../native_service.mk diff --git a/nsframework/backup_manager/server/src/bkup_param.cpp b/nsframework/backup_manager/server/src/bkup_param.cpp index 900779b..8d964bb 100755 --- a/nsframework/backup_manager/server/src/bkup_param.cpp +++ b/nsframework/backup_manager/server/src/bkup_param.cpp @@ -35,7 +35,7 @@ #include "bkup_util.h" #define BKUP_XML_PATH_MAX 100 -#define BKUP_XML_PATH "/usr/agl/conf/BS/ns/backup_manager/rodata/" +#define BKUP_XML_PATH "/usr/conf/BS/ns/backup_manager/rodata/" #define BKUP_XML_PREFIX "backup_" #define BKUP_XML_EXTENSION ".xml" diff --git a/nsframework/framework_unified/client/Makefile b/nsframework/framework_unified/client/Makefile index 29ed628..fec786b 100755 --- a/nsframework/framework_unified/client/Makefile +++ b/nsframework/framework_unified/client/Makefile @@ -263,7 +263,7 @@ install-data:install_cfg install -d -m 775 $(DESTDIR)/nv/BS/ns/framework_unified/rwdata install_cfg: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ns/framework_unified/rodata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ns/framework_unified/rodata NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg include ../../native_service.mk diff --git a/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp b/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp index 94f775c..f56cb98 100755 --- a/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp +++ b/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp @@ -106,7 +106,7 @@ FRAMEWORKUNIFIEDLOGSYSEVENTPARAM g_FrameworkunifiedLogSysEventParams = {FALSE}; #define ZONEMASK_MAX BITS_IN_TZONE // ((UI_32)(BITS_IN_TZONE * TZONE_COUNT)) #define FRAMEWORKUNIFIEDLOG_DEFAULT_FLAG_ID (0) -#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/usr/agl/conf/BS/ns/framework_unified/rodata/ns_logger_frameworkunifiedlog__CWORD84_.cfg" +#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/usr/conf/BS/ns/framework_unified/rodata/ns_logger_frameworkunifiedlog__CWORD84_.cfg" #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__TMP "ns_logger_frameworkunifiedlog__CWORD84_.tmp" #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV "ns_logger_frameworkunifiedlog__CWORD84_.cfg" diff --git a/nsframework/framework_unified/client/NativeServices/Makefile b/nsframework/framework_unified/client/NativeServices/Makefile index c346b28..cdc7dff 100755 --- a/nsframework/framework_unified/client/NativeServices/Makefile +++ b/nsframework/framework_unified/client/NativeServices/Makefile @@ -23,7 +23,7 @@ all: install-data:install_cfg install_cfg: - install -d -m 775 $(SDKTARGETSYSROOT)/usr/agl/conf/ns_logger - install -m 644 -t $(SDKTARGETSYSROOT)/usr/agl/conf/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg + install -d -m 775 $(SDKTARGETSYSROOT)/usr/conf/ns_logger + install -m 644 -t $(SDKTARGETSYSROOT)/usr/conf/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg include ../../../native_service.mk diff --git a/nsframework/native_service.mk b/nsframework/native_service.mk index 729362c..1e83da4 100755 --- a/nsframework/native_service.mk +++ b/nsframework/native_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/nv_hal/Makefile b/nv_hal/Makefile index 2f2d89f..48ac0cc 100755 --- a/nv_hal/Makefile +++ b/nv_hal/Makefile @@ -22,14 +22,14 @@ HEADER := hal_api/nv_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined diff --git a/otherservice/other_service.mk b/otherservice/other_service.mk index 85a2f2c..41b7d9d 100755 --- a/otherservice/other_service.mk +++ b/otherservice/other_service.mk @@ -39,4 +39,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/otherservice/rpc_library/tool/Makefile b/otherservice/rpc_library/tool/Makefile index 8ffd816..bdb7e84 100755 --- a/otherservice/rpc_library/tool/Makefile +++ b/otherservice/rpc_library/tool/Makefile @@ -24,8 +24,8 @@ YFLAGS := -d -t LEX := flex LFLAGS := -d -CPPFLAGS := -I../library/include -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h -CFLAGS := -Wall -Wno-unused-function -Wno-unused-variable -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CPPFLAGS := -I../library/include -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h +CFLAGS := -Wall -Wno-unused-function -Wno-unused-variable -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h rpc_apidef: apidef.tab.o lex.yy.o apidef.o $(CXX) $(CPPFLAGS) -o $@ $^ diff --git a/peripheralservice/peripheral_service.mk b/peripheralservice/peripheral_service.mk index c054722..3712f49 100755 --- a/peripheralservice/peripheral_service.mk +++ b/peripheralservice/peripheral_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/positioning_hal/Makefile b/positioning_hal/Makefile index 0b5a74d..837e28b 100755 --- a/positioning_hal/Makefile +++ b/positioning_hal/Makefile @@ -25,8 +25,8 @@ CXXFLAGS += -I./inc/Common CXXFLAGS += -I./inc/GpsCommon CXXFLAGS += -I./inc/LineSensDrv CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/ -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/ +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### @@ -37,7 +37,7 @@ CXXFLAGS += -DLINUX -D__CWORD71__VEHICLE_ -D__CWORD71_ LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := /usr/lib diff --git a/power_hal/Makefile b/power_hal/Makefile index b0a0c28..e007b63 100755 --- a/power_hal/Makefile +++ b/power_hal/Makefile @@ -21,9 +21,9 @@ HEADER := hal_api/power_hal.h ######### include paths/files ################### CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -#CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/stub -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +#CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/stub +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,9 +32,9 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib -RPATH := /usr/agl/lib +RPATH := /usr/lib ######### linked library ######################## LIBS += -Wl,-Bdynamic -lstdc++ diff --git a/security_hal/Makefile b/security_hal/Makefile index 5435be7..87f0057 100755 --- a/security_hal/Makefile +++ b/security_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/security_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/soc_temperature_hal/Makefile b/soc_temperature_hal/Makefile index fa30b35..6904577 100755 --- a/soc_temperature_hal/Makefile +++ b/soc_temperature_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/soc_temperature_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/stub/stub.mk b/stub/stub.mk index 44fb1e3..c8ff3d3 100755 --- a/stub/stub.mk +++ b/stub/stub.mk @@ -38,5 +38,5 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/systemservice/config/library/system_manager_config/last2order/Makefile b/systemservice/config/library/system_manager_config/last2order/Makefile index f38ee77..9f9ce40 100755 --- a/systemservice/config/library/system_manager_config/last2order/Makefile +++ b/systemservice/config/library/system_manager_config/last2order/Makefile @@ -16,13 +16,13 @@ # ==== Customization ================ #Directory path located XMLs for conversion -CONFXML_DIR_PATH ?= $(SDKTARGETSYSROOT)/usr/agl/conf/sm_last2order +CONFXML_DIR_PATH ?= $(SDKTARGETSYSROOT)/usr/conf/sm_last2order #path to order file -ORDER_DEF_PATH ?= $(SDKTARGETSYSROOT)/usr/agl/include/agl_wakeup_order.h +ORDER_DEF_PATH ?= $(SDKTARGETSYSROOT)/usr/include/agl_wakeup_order.h #path to be installed CFO file -CONF_INSTALL_DIR ?= $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager +CONF_INSTALL_DIR ?= $(SDKTARGETSYSROOT)/usr/conf/systemmanager # ================================== @@ -43,8 +43,8 @@ _all:$(CFOFILES) install:install-pre install-cfo install-pre: - install -d -m 775 $(DESTDIR)/usr/agl/conf/sm_last2order;\ - install -m 644 -t $(DESTDIR)/usr/agl/conf/systemmanager sm_last2order.cfo + install -d -m 775 $(DESTDIR)/usr/conf/sm_last2order;\ + install -m 644 -t $(DESTDIR)/usr/conf/systemmanager sm_last2order.cfo install-cfo:_all set -e ;\ diff --git a/systemservice/config/library/system_manager_config/order/Makefile b/systemservice/config/library/system_manager_config/order/Makefile index 38af0ee..8681a7c 100755 --- a/systemservice/config/library/system_manager_config/order/Makefile +++ b/systemservice/config/library/system_manager_config/order/Makefile @@ -18,14 +18,14 @@ HOST_CPP = cpp HOST_ORDER_XML2CFG = ./launch_order_xml2cfg.pl -CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf -CONF_WON_H = $(SDKTARGETSYSROOT)/usr/agl/include/agl_wakeup_order.h +CONF_DIR = $(SDKTARGETSYSROOT)/usr/conf +CONF_WON_H = $(SDKTARGETSYSROOT)/usr/include/agl_wakeup_order.h LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml) ORDER_XMLFILES = $(LAUNCH_XMLFILES:%.xml=%.order) ORDER_CFGFILES = $(ORDER_XMLFILES:%.order=%.order.cfg) -INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager +INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/conf/systemmanager CLEAN_FILES = launch_order_body.xml $(ORDER_CFGFILES) @@ -35,7 +35,7 @@ VPATH += ../xml install:install-pre install-cfg install-pre: - install -m 644 -t $(DESTDIR)/usr/agl/conf/sm_launch system_launcher_main.xml + install -m 644 -t $(DESTDIR)/usr/conf/sm_launch system_launcher_main.xml install-cfg:$(ORDER_CFGFILES) set -e ;\ diff --git a/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp b/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp index 16ec02a..db8e50c 100755 --- a/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp +++ b/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp @@ -130,7 +130,7 @@ static EFrameworkunifiedStatus setEvnVariableForLaunchConfigFile(std::string f_s l_pLaunchConfigFile = LaunchConfigFileName2; } - std::string cnfPath = "/usr/agl/conf/BS/ss/system_manager/rwdata/"; + std::string cnfPath = "/usr/conf/BS/ss/system_manager/rwdata/"; cnfPath += l_pLaunchConfigFile; if (access(cnfPath.c_str(), F_OK) != 0) { l_pLaunchConfigFile = LaunchConfigFileName1; @@ -301,7 +301,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) { SS_ASERT(configRet == eFrameworkunifiedStatusOK); // Set PRODUCT version information - const char prdVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/version.txt"; + const char prdVersion[] = "/usr/share/BS/ss/system_manager/rodata/version.txt"; { std::string line; std::ifstream prdFin(prdVersion); @@ -327,7 +327,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) { } // PHASE_INFO - const char phaseVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/PhaseInfo.txt"; + const char phaseVersion[] = "/usr/share/BS/ss/system_manager/rodata/PhaseInfo.txt"; { configRet = setVerInfo_version_date(phaseVersion); } diff --git a/systemservice/config/library/system_manager_config/xml/Makefile b/systemservice/config/library/system_manager_config/xml/Makefile index e11288c..6b07d29 100755 --- a/systemservice/config/library/system_manager_config/xml/Makefile +++ b/systemservice/config/library/system_manager_config/xml/Makefile @@ -18,13 +18,13 @@ HOST_CPP = cpp HOST_LAUNCH_XML2CFG = ./launch_xml2cfg.sh -CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf -CONF_THREAD_H = $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h +CONF_DIR = $(SDKTARGETSYSROOT)/usr/conf +CONF_THREAD_H = $(SDKTARGETSYSROOT)/usr/include/agl_thread.h LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml) LAUNCH_CFGFILES = $(LAUNCH_XMLFILES:%.xml=%.cfg) -INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager +INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/conf/systemmanager CLEAN_FILES = system_launcher_body.xml $(LAUNCH_CFGFILES) @@ -33,10 +33,10 @@ VPATH = $(CONF_DIR)/sm_launch install:install-pre install-cfg install-pre: - install -d -m 775 $(DESTDIR)/usr/agl/conf;\ - install -d -m 775 $(DESTDIR)/usr/agl/conf/sm_launch;\ - install -d -m 775 $(DESTDIR)/usr/agl/conf/systemmanager;\ - install -m 644 -t $(DESTDIR)/usr/agl/conf/sm_launch sm_launch_agl.xml + install -d -m 775 $(DESTDIR)/usr/conf;\ + install -d -m 775 $(DESTDIR)/usr/conf/sm_launch;\ + install -d -m 775 $(DESTDIR)/usr/conf/systemmanager;\ + install -m 644 -t $(DESTDIR)/usr/conf/sm_launch sm_launch_agl.xml install-cfg:$(LAUNCH_CFGFILES) set -e ;\ diff --git a/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg b/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg index 876ab41..e1c544a 100755 --- a/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg +++ b/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg @@ -1,7 +1,7 @@ # This file is created from sm_launch_agl.xml.tmp. # created date : Tue Aug 29 13:31:32 JST 2017 [ModulesLaunchConfig] -Launch1=CoreModules|1|0|False|NS_NPPService|/usr/agl/bin/NS_NPPService|25|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000|| -Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/agl/bin/NS_BackupMgr|25|True|0|-l console|NULL|NULL|True|True|15|1000|| +Launch1=CoreModules|1|0|False|NS_NPPService|/usr/bin/NS_NPPService|25|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000|| +Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/bin/NS_BackupMgr|25|True|0|-l console|NULL|NULL|True|True|15|1000|| Launch3=SS_Logger|2|0|False|SS_DevDetectSrv|/tmp/SS_DeviceDetectionService|20|True|0|-l console|NULL|NULL|True|False|1|1000|| -Launch4=SS_Logger|2|0|False|SS_LoggerSrv|/usr/agl/bin/SS_LoggerService|0|True|0|-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10|NULL|NULL|True|True|10|1000|| +Launch4=SS_Logger|2|0|False|SS_LoggerSrv|/usr/bin/SS_LoggerService|0|True|0|-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10|NULL|NULL|True|True|10|1000|| diff --git a/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml b/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml index a433be3..6560832 100755 --- a/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml +++ b/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml @@ -1,14 +1,14 @@ <!-- group_id=1 --> <group name="CoreModules" wait_time="0" trigger="False" > <launch - name="NS_NPPService" path="/usr/agl/bin/NS_NPPService" priority="25" + name="NS_NPPService" path="/usr/bin/NS_NPPService" priority="25" critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2" logging_mask="NULL" restart="NULL" is_start_required="False" shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000" user_name="" /> <launch - name="NS_BackupMgr" path="/usr/agl/bin/NS_BackupMgr" priority="25" + name="NS_BackupMgr" path="/usr/bin/NS_BackupMgr" priority="25" critical="True" retry_cnt="0" arguments="-l console" logging_mask="NULL" restart="NULL" is_start_required="True" shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000" @@ -25,7 +25,7 @@ user_name="" /> <launch - name="SS_LoggerSrv" path="/usr/agl/bin/SS_LoggerService" priority="0" + name="SS_LoggerSrv" path="/usr/bin/SS_LoggerService" priority="0" critical="True" retry_cnt="0" arguments="-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10" logging_mask="NULL" restart="NULL" is_start_required="True" shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000" diff --git a/systemservice/interface_unified/Makefile.client b/systemservice/interface_unified/Makefile.client index de16e15..06a6ebd 100755 --- a/systemservice/interface_unified/Makefile.client +++ b/systemservice/interface_unified/Makefile.client @@ -19,14 +19,14 @@ SUBDIRS := library install:install_cfg install_cfg_pram install_cfg_pram: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg install_cfg: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata scfg/ss_logger.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/power_service/rodata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/logger_service/rodata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/logger_service/rodata scfg/ss_logger.cfg include ../system_service.mk diff --git a/systemservice/interface_unified/library/include/ss_last_to_order_local.h b/systemservice/interface_unified/library/include/ss_last_to_order_local.h index 889a733..6a918e8 100755 --- a/systemservice/interface_unified/library/include/ss_last_to_order_local.h +++ b/systemservice/interface_unified/library/include/ss_last_to_order_local.h @@ -33,7 +33,7 @@ #include <string> -#define SS_LAST_TO_ORDER_CONF_PATH "/usr/agl/conf/BS/ss/system_manager/rodata/sm_last2order.cfo" +#define SS_LAST_TO_ORDER_CONF_PATH "/usr/conf/BS/ss/system_manager/rodata/sm_last2order.cfo" #endif // INTERFACE_UNIFIED_LIBRARY_INCLUDE_SS_LAST_TO_ORDER_LOCAL_H_ /** @}*/ diff --git a/systemservice/logger_service/server/SS_LoggerService.conf_bin b/systemservice/logger_service/server/SS_LoggerService.conf_bin index 440d361..0fe3783 100755 --- a/systemservice/logger_service/server/SS_LoggerService.conf_bin +++ b/systemservice/logger_service/server/SS_LoggerService.conf_bin @@ -1,4 +1,4 @@ -/usr/agl/bin|${OSW_reldbg} +/usr/bin|${OSW_reldbg} debug|dbg release|rel product|rel diff --git a/systemservice/logger_service/server/include/ss_logger_scrshot.h b/systemservice/logger_service/server/include/ss_logger_scrshot.h index 5cc9dd9..3cd22a6 100755 --- a/systemservice/logger_service/server/include/ss_logger_scrshot.h +++ b/systemservice/logger_service/server/include/ss_logger_scrshot.h @@ -24,7 +24,7 @@ #define JPEG_PATH_CH0 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg" #define JPEG_PATH_CH1 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg" -#define SCRSHOT_EXE_PATH "/usr/agl/bin/SS_ScrShot" +#define SCRSHOT_EXE_PATH "/usr/bin/SS_ScrShot" #define SCREEN_SHOT_PATH "/nv/BS/ss/logger_service/rwdata/screenShot" #endif // LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ diff --git a/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp b/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp index 2bd8b79..ec084ab 100755 --- a/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp +++ b/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp @@ -51,7 +51,7 @@ #include "ss_logger_store_logs_loggerservicelog.h" #include "ss_logger_cfg.h" -#define LOGGERSERVICELOG_CONFIG_PATH "/usr/agl/conf/BS/ss/logger_service/rodata/ss_logger.cfg" +#define LOGGERSERVICELOG_CONFIG_PATH "/usr/conf/BS/ss/logger_service/rodata/ss_logger.cfg" #define LOGGER_TMP_FN "__LOGGER.tmp" #define LOGGERSERVICELOG_TMP_OUTPUT_PATH "/tmp" #define PSTORE_DIR_PATH "/dev/pstore" diff --git a/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin b/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin index 440d361..0fe3783 100755 --- a/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin +++ b/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin @@ -1,4 +1,4 @@ -/usr/agl/bin|${OSW_reldbg} +/usr/bin|${OSW_reldbg} debug|dbg release|rel product|rel diff --git a/systemservice/logger_service/server/src/loggerservice_application.cpp b/systemservice/logger_service/server/src/loggerservice_application.cpp index 2d39fb2..3ea6250 100755 --- a/systemservice/logger_service/server/src/loggerservice_application.cpp +++ b/systemservice/logger_service/server/src/loggerservice_application.cpp @@ -178,7 +178,7 @@ EFrameworkunifiedStatus FrameworkunifiedOnInitialization(HANDLE hApp) { LOG_STATUS_IF_ERRORED(l_eStatus, "g_loggerCfg.Initialize()"); // LCOV_EXCL_BR_LINE 15: macro std::string l_cfgFilePathAndName = - "/usr/agl/conf/BS/ss/logger_service/rodata/ss_logger.cfg"; + "/usr/conf/BS/ss/logger_service/rodata/ss_logger.cfg"; if (eFrameworkunifiedStatusOK != (l_eStatus = g_loggerCfg.Load(l_cfgFilePathAndName))) { // LCOV_EXCL_BR_LINE 200:To ensure success // LCOV_EXCL_START 200:To ensure success AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert diff --git a/systemservice/power_service/server/src/ss_power.cpp b/systemservice/power_service/server/src/ss_power.cpp index 26e8881..2e75b3d 100755 --- a/systemservice/power_service/server/src/ss_power.cpp +++ b/systemservice/power_service/server/src/ss_power.cpp @@ -135,7 +135,7 @@ EFrameworkunifiedStatus Power::Initialize(HANDLE h_app) { pthread_mutex_init(&pwr_hist_mutex, NULL); /// Open and parse the configuration data for Power - const CHAR configFileName[] = "/usr/agl/conf/BS/ss/power_service/rodata/gpf_ss_ps_config.cfg"; + const CHAR configFileName[] = "/usr/conf/BS/ss/power_service/rodata/gpf_ss_ps_config.cfg"; PowerConfiguration config(configFileName); l_SpecifiedCfgLoaded = config.LoadParameters(m_tConfigData); diff --git a/systemservice/resource_manager/server/src/resm.cpp b/systemservice/resource_manager/server/src/resm.cpp index 41caa19..6bed6bd 100755 --- a/systemservice/resource_manager/server/src/resm.cpp +++ b/systemservice/resource_manager/server/src/resm.cpp @@ -90,9 +90,9 @@ CFrameworkunifiedVersion g_FrameworkunifiedVersion(MAJORNO, MINORNO, REVISION); #define DEBUG_INFO_CPU_TOP_LINES (10) #define DEBUG_INFO_CMA_MIN (160000) // in KB #define DEBUG_INFO_CMA_LETTERS (20) -#define DEBUG_INFO_DSP_PG_PATH "/usr/agl/bin/bs_analysis_dispinfo_debug" +#define DEBUG_INFO_DSP_PG_PATH "/usr/bin/bs_analysis_dispinfo_debug" -#define DROP_CACHES_PG_PATH "/usr/agl/bin/drop_caches" +#define DROP_CACHES_PG_PATH "/usr/bin/drop_caches" #define READLINE_MAX_SIZE 512 #define READ_MAX_SIZE 4096 diff --git a/systemservice/system_manager/server/Makefile b/systemservice/system_manager/server/Makefile index 04185f9..4793ba8 100755 --- a/systemservice/system_manager/server/Makefile +++ b/systemservice/system_manager/server/Makefile @@ -106,13 +106,13 @@ LINK_CXX=Y install-data: install_data install_data: - cpp -P -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml - $(SDKTARGETSYSROOT)/usr/agl/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg - install -d -m 755 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata - install -m 644 ./sm_launch.cfg $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata + cpp -P -include $(SDKTARGETSYSROOT)/usr/include/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml + $(SDKTARGETSYSROOT)/usr/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg + install -d -m 755 $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata + install -m 644 ./sm_launch.cfg $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata install -d -m 755 $(DESTDIR)/nv/BS/ss/system_manager/rwdata - install -d -m 755 $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata - install -m 644 ./version.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata - install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata + install -d -m 755 $(DESTDIR)/usr/share/BS/ss/system_manager/rodata + install -m 644 ./version.txt $(DESTDIR)/usr/share/BS/ss/system_manager/rodata + install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/share/BS/ss/system_manager/rodata include ../../system_service.mk diff --git a/systemservice/system_manager/server/include/ss_sm_default_paths.h b/systemservice/system_manager/server/include/ss_sm_default_paths.h index 8ffafd9..5f8ab88 100755 --- a/systemservice/system_manager/server/include/ss_sm_default_paths.h +++ b/systemservice/system_manager/server/include/ss_sm_default_paths.h @@ -34,7 +34,7 @@ const CHAR UsingVMPlayerVariable[] = "USING_VM_PLAYER"; */ const CHAR DefaultBasePath[] = ""; const CHAR DefaultBinaryPath[] = "/agl/bin/"; -const CHAR DefaultConfigFilesPath[] = "/usr/agl/conf/BS/ss/system_manager/rwdata/"; +const CHAR DefaultConfigFilesPath[] = "/usr/conf/BS/ss/system_manager/rwdata/"; const CHAR DefaultLaunchConfigFileName[] = "sm_launch.cfg"; const CHAR DefaultSMConfigFileName[] = "gpf_ss_sm_config_data.cfg"; diff --git a/systemservice/system_manager/server/sm_launch__CWORD84_.xml b/systemservice/system_manager/server/sm_launch__CWORD84_.xml index 1392bbb..ab49871 100755 --- a/systemservice/system_manager/server/sm_launch__CWORD84_.xml +++ b/systemservice/system_manager/server/sm_launch__CWORD84_.xml @@ -1,14 +1,14 @@ <!-- group_id=1 -->
<group name="CoreModules" wait_time="0" trigger="False" >
<launch
- name=MN_NS_NPPSERVICE path="/usr/agl/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S
+ name=MN_NS_NPPSERVICE path="/usr/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S
critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2"
restart="NULL" is_start_required="False"
shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
user_name=""
/>
<launch
- name=MN_NS_BACKUPMGR path="/usr/agl/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S
+ name=MN_NS_BACKUPMGR path="/usr/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000"
@@ -18,7 +18,7 @@ <!-- group_id=2 -->
<group name="SS_Logger" wait_time="0" trigger="False" >
<launch
- name=MN_SS_LOGGERSRV path="/usr/agl/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S
+ name=MN_SS_LOGGERSRV path="/usr/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S
critical="True" retry_cnt="0" arguments="-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10"
restart="NULL" is_start_required="True"
shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000"
@@ -35,7 +35,7 @@ because the LOG save processing is performed by the GROUP2 termination processing of SS_LoggerService.
-->
<launch
- name=MN_COMMUNICATION path="/usr/agl/bin/communication" priority=PR_COMMUNICATION_S
+ name=MN_COMMUNICATION path="/usr/bin/communication" priority=PR_COMMUNICATION_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
@@ -46,7 +46,7 @@ <!-- group_id=4 -->
<group name="VehicleModules" wait_time="0" trigger="False" >
<launch
- name=MN_POSITIONING path="/usr/agl/bin/Positioning" priority=PR_POSITIONING_S
+ name=MN_POSITIONING path="/usr/bin/Positioning" priority=PR_POSITIONING_S
critical="True" retry_cnt="0" arguments="NULL"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
@@ -57,21 +57,21 @@ <!-- group_id=5 -->
<group name="SystemModules" wait_time="0" trigger="False" >
<launch
- name=MN_SS_POWERSERVICE path="/usr/agl/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S
+ name=MN_SS_POWERSERVICE path="/usr/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
user_name=""
/>
<launch
- name=MN_SS_TASKMANAGER path="/usr/agl/bin/tskmgr" priority=PR_SS_TASKMANAGER_S
+ name=MN_SS_TASKMANAGER path="/usr/bin/tskmgr" priority=PR_SS_TASKMANAGER_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="True" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
user_name=""
/>
<launch
- name=MN_SS_RESOURCEMGR path="/usr/agl/bin/resm" priority=PR_SS_RESOURCEMGR_S
+ name=MN_SS_RESOURCEMGR path="/usr/bin/resm" priority=PR_SS_RESOURCEMGR_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
diff --git a/systemservice/system_manager/server/src/ss_system_manager.cpp b/systemservice/system_manager/server/src/ss_system_manager.cpp index 8e26f23..b767ed7 100755 --- a/systemservice/system_manager/server/src/ss_system_manager.cpp +++ b/systemservice/system_manager/server/src/ss_system_manager.cpp @@ -96,7 +96,7 @@ using namespace std; // NOLINT static CSystemManager g_oSystemManger; #define SS_SM_TEMP_FILE_FOR_STORE_LOGS "/nv/BS/ss/system_manager/rwdata/sm_tempStoreLogs" -#define TR_USB_PATH "/usr/agl/bin/realtimeUsbLog" +#define TR_USB_PATH "/usr/bin/realtimeUsbLog" // \brief: public structure that is used for logging by NSLogger. FRAMEWORKUNIFIEDLOGPARAM g_FrameworkunifiedLogParams = { diff --git a/systemservice/system_service.mk b/systemservice/system_service.mk index 5444eb4..ec90250 100755 --- a/systemservice/system_service.mk +++ b/systemservice/system_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/systemservice/task_manager/client/libtskmcfg/Makefile b/systemservice/task_manager/client/libtskmcfg/Makefile index 9fe2ed3..18b1f46 100755 --- a/systemservice/task_manager/client/libtskmcfg/Makefile +++ b/systemservice/task_manager/client/libtskmcfg/Makefile @@ -45,8 +45,8 @@ install:install-pre install-pre-header build-lib:install-pre install-pre-header install-lib:install-pre install-pre-header install-pre: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/task_manager/rodata;\ - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/task_manager/rodata $(WAKESHUTCONF_DIR)/tskm_launch.xml;\ + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/task_manager/rodata;\ + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/task_manager/rodata $(WAKESHUTCONF_DIR)/tskm_launch.xml;\ CONFIG_FILES:=tskm_wakeup.xml tskm_shutdown.xml tskm_wakeup_vup.xml tskm_shutdown_vup.xml tskm_launch.xml tskm_svcid.h agl_thread.h @@ -79,7 +79,7 @@ agl_thread.h:$(WAKESHUTCONF_DIR)/agl_thread.h tskm_launch.xml:$(WAKESHUTCONF_DIR)/tskm_launch.xml agl_thread.h $(HOST_CPP) -P -include agl_thread.h $< > $@ -#tskm_launch.xml:$(SVCONF_DIR)/tskm_launch.xml $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h +#tskm_launch.xml:$(SVCONF_DIR)/tskm_launch.xml $(SDKTARGETSYSROOT)/usr/include/agl_thread.h # $(HOST_CPP) -P -include agl_thread.h $< > $@ $(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES) diff --git a/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml b/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml index d4ab06c..a7d7273 100755 --- a/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml +++ b/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml @@ -2,7 +2,7 @@ <service svcid="TSKM_SVCID_ACTIVITYMGR" name=MN_ACTIVITYMANAGER - path="/usr/agl/bin/acmsrv" + path="/usr/bin/acmsrv" prio=PR_ACTIVITYMANAGER_S policy="tss" life_cycle="always" @@ -12,7 +12,7 @@ <service svcid="TSKM_SVCID_TE_RESIDENT" name=MN_RESIDENT_SVC - path="/usr/agl/bin/resident" + path="/usr/bin/resident" prio=PR_RESIDENT_SVC_S policy="tss" life_cycle="always" @@ -22,7 +22,7 @@ <service svcid="TSKM_SVCID_TE_TRANSIENT" name =MN_TRANSIENT_SVC - path="/usr/agl/bin/transient" + path="/usr/bin/transient" prio=PR_TRANSIENT_SVC_S policy="tss" user="" @@ -32,7 +32,7 @@ <service svcid="TSKM_SVCID__CWORD58_" name =MN__CWORD58_SERVICE - path="/usr/agl/bin/_CWORD58_Service" + path="/usr/bin/_CWORD58_Service" prio=PR__CWORD58_SERVICE_S policy="tss" retry_cnt="-1" @@ -60,7 +60,7 @@ <service svcid="TSKM_SVCID_XMVUPSRV" name =MN_XMVUPSERVICE - path="/usr/agl/bin/radio_xm_update" + path="/usr/bin/radio_xm_update" prio=PR_XMVUPSERVICE_S policy="tss" user="" @@ -69,7 +69,7 @@ <service svcid="TSKM_SVCID_BTPHONESRV" name =MN_BTPHONESRV - path="/usr/agl/bin/BT_PhoneSrv" + path="/usr/bin/BT_PhoneSrv" prio=PR_BTPHONESRV_S policy="tss" user="" @@ -78,7 +78,7 @@ <service svcid="TSKM_SVCID_BTPBKSRV" name =MN_BTPBKSRV - path="/usr/agl/bin/BT_PbkSrv" + path="/usr/bin/BT_PbkSrv" prio=PR_BTPBKSRV_S policy="tss" user="" @@ -87,7 +87,7 @@ <service svcid="TSKM_SVCID_BTMSGSRV" name =MN_BTMSGSRV - path="/usr/agl/bin/BT_MsgSrv" + path="/usr/bin/BT_MsgSrv" prio=PR_BTMSGSRV_S policy="tss" user="" @@ -96,7 +96,7 @@ <service svcid="TSKM_SVCID_DTVVUPSRV" name =MN_DTVVUPSERVICE - path="/usr/agl/bin/DtvVupService" + path="/usr/bin/DtvVupService" prio=PR_DTVVUPSERVICE_S policy="tss" user="" diff --git a/usb_hal/Makefile b/usb_hal/Makefile index 1a107ce..54ec566 100755 --- a/usb_hal/Makefile +++ b/usb_hal/Makefile @@ -22,8 +22,8 @@ HEADER := ./hal_api/usb_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/vehicle_hal/Makefile b/vehicle_hal/Makefile index d009b13..208732d 100755 --- a/vehicle_hal/Makefile +++ b/vehicle_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/vehicle_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := /usr/lib diff --git a/vehicleservice/positioning/server/src/Sensor/Makefile b/vehicleservice/positioning/server/src/Sensor/Makefile index bb70229..10fb647 100755 --- a/vehicleservice/positioning/server/src/Sensor/Makefile +++ b/vehicleservice/positioning/server/src/Sensor/Makefile @@ -155,7 +155,7 @@ CPPFLAGS += -I../ServiceInterface/VehicleIf CPPFLAGS += -I../nsfw/include #CPPFLAGS += -I../../../../diag_code/library/include -CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/vehicle_service +CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/vehicle_service ######### add compile option ############# CPPFLAGS += -DLINUX diff --git a/vehicleservice/vehicle_service.mk b/vehicleservice/vehicle_service.mk index 40d337f..a919901 100755 --- a/vehicleservice/vehicle_service.mk +++ b/vehicleservice/vehicle_service.mk @@ -39,4 +39,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/video_in_hal/Makefile b/video_in_hal/Makefile index 25ebaab..8aa5853 100755 --- a/video_in_hal/Makefile +++ b/video_in_hal/Makefile @@ -21,7 +21,7 @@ HEADER = hal_api/video_in_hal.h ######### include paths/files ################### CFLAGS += -I./hal_api/ -CFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CFLAGS += -Wall -fPIC diff --git a/video_in_hal/agl-basefiles/share/agl.mk b/video_in_hal/agl-basefiles/share/agl.mk index 77d4512..94bf036 100644 --- a/video_in_hal/agl-basefiles/share/agl.mk +++ b/video_in_hal/agl-basefiles/share/agl.mk @@ -86,7 +86,7 @@ DESTDIR ?= $(SDKTARGETSYSROOT) WARN_FLAGS ?= -Wall DEBUG_FLAGS ?= -g -AUTO_INCLUDE := -include $(SYSROOT)/usr/agl/include/agl_types_obsoluted.h +AUTO_INCLUDE := -include $(SYSROOT)/usr/include/agl_types_obsoluted.h AGLCFLAGS := $(CFLAGS) $(COMPONENT_CFLAGS) AGLCXXFLAGS := $(CXXFLAGS) $(COMPONENT_CXXFLAGS) AGLCPPFLAGS := $(CPPFLAGS) $(COMPONENT_CPPFLAGS) @@ -200,10 +200,10 @@ AGLCPPFLAGS += -D_GNU_SOURCE AGLCPPFLAGS += -DAGL_PosixBasedOS001LEGACY_USED -DAGL_STUB -DLINUX ## for agl header## -AGLCPPFLAGS += -I$(SYSROOT)/usr/agl/include +AGLCPPFLAGS += -I$(SYSROOT)/usr/include ## for agl library## -AGLLDFLAGS += -L$(SYSROOT)/usr/agl/lib +AGLLDFLAGS += -L$(SYSROOT)/usr/lib ifneq ($(INST_SHLIBS),libagl_stub) AGLLDLIBS += -Wl,-Bdynamic -lpthread @@ -331,7 +331,7 @@ endif ################################################################################# -RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/agl/lib +RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib ################################################################################# SUBDIRS := $(filter-out mock,$(SUBDIRS)) @@ -399,7 +399,7 @@ build-arlib: $(INST_LIBS:%=%.a) $(NOINST_LIBS:%=%.a) TOPDIR=$(abspath ./) generate-header-list: install-header-local echo $(COMPONENT_NAME) > $(addsuffix .list, $(abspath ./)) - ls -1 $(TOPDIR)/tmp_head/usr/agl/include/$(COMPONENT_NAME)/ >> $(addsuffix .list, $(abspath ./)) + ls -1 $(TOPDIR)/tmp_head/usr/include/$(COMPONENT_NAME)/ >> $(addsuffix .list, $(abspath ./)) rm -rf ./tmp_head @@ -444,8 +444,8 @@ ifneq ($(strip $(INST_HEADERS)),) endif -HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/launch_xml2cfg.sh -CONF_H = $(SYSROOT)/usr/agl/include/sm_launch_conf.h +HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/share/launch_xml2cfg.sh +CONF_H = $(SYSROOT)/usr/include/sm_launch_conf.h %.cfg: %.xml set -e; \ diff --git a/video_in_hal/agl-systemd/env.txt b/video_in_hal/agl-systemd/env.txt index 48b83df..f784b5e 100755 --- a/video_in_hal/agl-systemd/env.txt +++ b/video_in_hal/agl-systemd/env.txt @@ -7,9 +7,9 @@ TERM="xterm" INIT_UID="1000" INIT_GID="1000" AGL_RWDATA_PATH="/nv" -LD_LIBRARY_PATH="/lib:/usr/lib:/usr/agl/lib:/usr/debug/lib" +LD_LIBRARY_PATH="/lib:/usr/lib:/usr/lib:/usr/debug/lib" ARB_OPT="FORCE_REBOOT" -PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/agl/bin:/usr/debug/bin:/usr/debug/sbin:/usr/debug/usr/bin:/usr/debug/usr/sbin" +PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/bin:/usr/debug/bin:/usr/debug/sbin:/usr/debug/usr/bin:/usr/debug/usr/sbin" PWD="/dev/mqueue" OLDPWD="/dev/mqueue" SHLVL="1" diff --git a/video_in_hal/agl-systemd/tool_9E_SI/launch_sm.sh b/video_in_hal/agl-systemd/tool_9E_SI/launch_sm.sh index ed1e8d1..da9cf23 100755 --- a/video_in_hal/agl-systemd/tool_9E_SI/launch_sm.sh +++ b/video_in_hal/agl-systemd/tool_9E_SI/launch_sm.sh @@ -19,8 +19,8 @@ export APPS_CONFIG_FILENAME=sm_launch.cfg export SM_CONFIG_DATA_FILENAME=gpf_ss_sm_config_data.cfg export XDG_RUNTIME_DIR=/run/user/0 -cd /usr/agl/bin/ +cd /usr/bin/ rm -rf /nv/romaccess rm /dev/shm/lockfile -/usr/agl/bin/SS_SystemManager & +/usr/bin/SS_SystemManager & diff --git a/video_in_hal/agl-systemd/tool_9E_SI/setup_refhw.sh b/video_in_hal/agl-systemd/tool_9E_SI/setup_refhw.sh index e3f33a4..6041140 100755 --- a/video_in_hal/agl-systemd/tool_9E_SI/setup_refhw.sh +++ b/video_in_hal/agl-systemd/tool_9E_SI/setup_refhw.sh @@ -29,7 +29,7 @@ echo "AREA=$VEHICLEPARAMETERLIBRARY_AREA" >> /tmp/udev_device.env # Start: Workaround for release ############################################### ## Sprint 29 To make WebService can update contents. -#chown -R agl:agl /usr/agl/data/electronicom +#chown -R agl:agl /usr/data/electronicom ## For btservice initial data. #chown -R agl:agl /nv/backup/D_BK_CA_BT_MANAGEMENT ## Sprint 29 PFDRECThread @@ -40,7 +40,7 @@ restorecon -R /ramd ## Sprint 29 communication #chmod -R 777 /home/root/.app_can_d # TODO:for bluetooth_service -#chmod 777 /usr/agl/share +#chmod 777 /usr/share #if `df -T / | grep nfs > /dev/null`; then #cp /sbin/insmod.kmod /tmp/insmod.kmod diff --git a/video_in_hal/agl-systemd/usr/target/agl_cap.lst b/video_in_hal/agl-systemd/usr/target/agl_cap.lst index 89ea096..306f8b0 100755 --- a/video_in_hal/agl-systemd/usr/target/agl_cap.lst +++ b/video_in_hal/agl-systemd/usr/target/agl_cap.lst @@ -1,34 +1,34 @@ -/usr/agl/bin/SS_SystemManager|||cap_sys_nice,cap_setuid,cap_setgid,cap_sys_resource+ep|y -/usr/agl/bin/tskmgr|||cap_sys_nice,cap_setuid,cap_setgid=ep|y -/usr/agl/bin/SS_DeviceDetectionService|||cap_setuid,cap_setgid,cap_sys_resource,cap_dac_override,cap_sys_admin+ep|y -/usr/agl/bin/communication|||cap_dac_override+ep|y -/usr/agl/bin/AS_AudioManager|||cap_sys_nice+ep|y -/usr/agl/bin/acmsrv|||cap_dac_override,cap_sys_admin,cap_sys_nice,cap_sys_resource,cap_chown,cap_fowner,cap_setgid,cap_setuid,cap_kill+ep|y -/usr/agl/bin/PS_SwitchHandler|||cap_sys_admin,cap_dac_override+ep|y -/usr/agl/bin/LockManager|||cap_kill+ep|y -/usr/agl/bin/nandupdate|||cap_dac_override+ep|y -/usr/agl/bin/wlan_controller|||cap_net_raw,cap_net_admin+ep|y -/usr/agl/bin/DummyRead|||cap_dac_read_search+ep|y -/usr/agl/bin/clock|||cap_sys_time+ep|y -/usr/agl/bin/Mounter|||cap_sys_admin,cap_dac_override+ep|y -/usr/agl/bin/MounterEx|||cap_sys_admin,cap_fowner,cap_dac_override,cap_chown+ep|y -/usr/agl/bin/DevReproService|||cap_chown,cap_fowner,cap_dac_override+ep|y -/usr/agl/bin/PS_CDR|||cap_sys_admin+ep|y -/usr/agl/bin/webdavmgr|||cap_net_admin,cap_net_raw+ep|y -/usr/agl/bin/DiagService|||cap_sys_rawio,cap_dac_override+ep|y -/usr/agl/bin/resm|||cap_setuid+ep|y -/usr/agl/bin/SS_LoggerService|||cap_dac_override+ep|y -/usr/agl/bin/NetworkManager|||cap_setuid,cap_setgid,cap_sys_admin,cap_chown,cap_kill,cap_net_raw,cap_net_admin,cap_net_bind_service+ep|y -/usr/agl/bin/RadioService|||cap_sys_nice+ep|y -/usr/agl/bin/ASND_VProxy|||cap_sys_nice+ep|y -/usr/agl/bin/misink|||cap_sys_nice+ep|y -/usr/agl/bin/mlink|||cap_sys_nice+ep|y -/usr/agl/bin/media_service|||cap_dac_override,cap_sys_nice+ep|y -/usr/agl/bin/_CWORD74__service|||cap_dac_override+ep|y -/usr/agl/bin/PlaybackService|||cap_sys_nice+ep|y -/usr/agl/bin/Positioning|||cap_dac_override+ep|y -/usr/agl/bin/vehicle|||cap_dac_override+ep|y -/usr/agl/bin/bluetooth_srv|||cap_dac_override,cap_sys_nice+ep|y -/usr/agl/bin/btd_srv|||cap_dac_override,cap_sys_nice+ep|y -/usr/agl/bin/NS_BackupMgr|||cap_dac_override+ep|y -/usr/agl/bin/Sound|||cap_dac_override+ep|y +/usr/bin/SS_SystemManager|||cap_sys_nice,cap_setuid,cap_setgid,cap_sys_resource+ep|y +/usr/bin/tskmgr|||cap_sys_nice,cap_setuid,cap_setgid=ep|y +/usr/bin/SS_DeviceDetectionService|||cap_setuid,cap_setgid,cap_sys_resource,cap_dac_override,cap_sys_admin+ep|y +/usr/bin/communication|||cap_dac_override+ep|y +/usr/bin/AS_AudioManager|||cap_sys_nice+ep|y +/usr/bin/acmsrv|||cap_dac_override,cap_sys_admin,cap_sys_nice,cap_sys_resource,cap_chown,cap_fowner,cap_setgid,cap_setuid,cap_kill+ep|y +/usr/bin/PS_SwitchHandler|||cap_sys_admin,cap_dac_override+ep|y +/usr/bin/LockManager|||cap_kill+ep|y +/usr/bin/nandupdate|||cap_dac_override+ep|y +/usr/bin/wlan_controller|||cap_net_raw,cap_net_admin+ep|y +/usr/bin/DummyRead|||cap_dac_read_search+ep|y +/usr/bin/clock|||cap_sys_time+ep|y +/usr/bin/Mounter|||cap_sys_admin,cap_dac_override+ep|y +/usr/bin/MounterEx|||cap_sys_admin,cap_fowner,cap_dac_override,cap_chown+ep|y +/usr/bin/DevReproService|||cap_chown,cap_fowner,cap_dac_override+ep|y +/usr/bin/PS_CDR|||cap_sys_admin+ep|y +/usr/bin/webdavmgr|||cap_net_admin,cap_net_raw+ep|y +/usr/bin/DiagService|||cap_sys_rawio,cap_dac_override+ep|y +/usr/bin/resm|||cap_setuid+ep|y +/usr/bin/SS_LoggerService|||cap_dac_override+ep|y +/usr/bin/NetworkManager|||cap_setuid,cap_setgid,cap_sys_admin,cap_chown,cap_kill,cap_net_raw,cap_net_admin,cap_net_bind_service+ep|y +/usr/bin/RadioService|||cap_sys_nice+ep|y +/usr/bin/ASND_VProxy|||cap_sys_nice+ep|y +/usr/bin/misink|||cap_sys_nice+ep|y +/usr/bin/mlink|||cap_sys_nice+ep|y +/usr/bin/media_service|||cap_dac_override,cap_sys_nice+ep|y +/usr/bin/_CWORD74__service|||cap_dac_override+ep|y +/usr/bin/PlaybackService|||cap_sys_nice+ep|y +/usr/bin/Positioning|||cap_dac_override+ep|y +/usr/bin/vehicle|||cap_dac_override+ep|y +/usr/bin/bluetooth_srv|||cap_dac_override,cap_sys_nice+ep|y +/usr/bin/btd_srv|||cap_dac_override,cap_sys_nice+ep|y +/usr/bin/NS_BackupMgr|||cap_dac_override+ep|y +/usr/bin/Sound|||cap_dac_override+ep|y diff --git a/video_in_hal/boot_hal/Makefile b/video_in_hal/boot_hal/Makefile index d184316..9349d2a 100755 --- a/video_in_hal/boot_hal/Makefile +++ b/video_in_hal/boot_hal/Makefile @@ -22,14 +22,14 @@ HEADER := hal_api/boot_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined diff --git a/video_in_hal/can_hal/can_hal.mk b/video_in_hal/can_hal/can_hal.mk index 19a824d..4fa3a77 100755 --- a/video_in_hal/can_hal/can_hal.mk +++ b/video_in_hal/can_hal/can_hal.mk @@ -36,4 +36,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/video_in_hal/can_hal/src/Makefile b/video_in_hal/can_hal/src/Makefile index f34eb75..8a99bcc 100755 --- a/video_in_hal/can_hal/src/Makefile +++ b/video_in_hal/can_hal/src/Makefile @@ -38,9 +38,9 @@ LDFLAGS += -shared LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib -RPATH := /usr/lib:/usr/agl/lib +RPATH := /usr/lib:/usr/lib ######### linked library ######################## LDLIBS += -Wl,-Bdynamic -lstdc++ diff --git a/video_in_hal/clock_hal/Makefile b/video_in_hal/clock_hal/Makefile index e417a15..11932be 100755 --- a/video_in_hal/clock_hal/Makefile +++ b/video_in_hal/clock_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/clock_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -33,7 +33,7 @@ CXXFLAGS += -DAGL_REFHW LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/video_in_hal/deck_hal/Makefile b/video_in_hal/deck_hal/Makefile index fbe4ddf..3c9580c 100755 --- a/video_in_hal/deck_hal/Makefile +++ b/video_in_hal/deck_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/deck_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := /usr/lib diff --git a/video_in_hal/input_hal/Makefile b/video_in_hal/input_hal/Makefile index 35dfefd..abf31c0 100755 --- a/video_in_hal/input_hal/Makefile +++ b/video_in_hal/input_hal/Makefile @@ -24,9 +24,9 @@ HEADER := ./hal_api/input_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/libdrm -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -36,7 +36,7 @@ CXXFLAGS += -D_USE_DRM LDFLAGS := -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib ######### linked library ######################## LIBS := -Wl,-Bdynamic -lstdc++ @@ -76,6 +76,6 @@ install: @echo $@ done. install-input: - install -m 0755 -d $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ - install -m 0644 ./hal_api/$(COMPONENT_NAME)/aglinput.h $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ - install -m 0644 ./hal_api/$(COMPONENT_NAME)/extinput.h $(DESTDIR)/usr/agl/include/$(COMPONENT_NAME)/ + install -m 0755 -d $(DESTDIR)/usr/include/$(COMPONENT_NAME)/ + install -m 0644 ./hal_api/$(COMPONENT_NAME)/aglinput.h $(DESTDIR)/usr/include/$(COMPONENT_NAME)/ + install -m 0644 ./hal_api/$(COMPONENT_NAME)/extinput.h $(DESTDIR)/usr/include/$(COMPONENT_NAME)/ diff --git a/video_in_hal/nsframework/backup_manager/config/Makefile b/video_in_hal/nsframework/backup_manager/config/Makefile index b307a66..b27741e 100755 --- a/video_in_hal/nsframework/backup_manager/config/Makefile +++ b/video_in_hal/nsframework/backup_manager/config/Makefile @@ -37,6 +37,6 @@ $(ID_HEADER): $(XML_PATH)/$(ALL_XML) CLEAN_FILES := $(ID_HEADER) install: $(XML_PATH)/$(BACKUP_XML) - install -m 0755 -d $(DESTDIR)/usr/agl/conf/BS/ns/backup_manager/rodata - install -m 0644 $(XML_PATH)/$(BACKUP_XML) $(DESTDIR)/usr/agl/conf/BS/ns/backup_manager/rodata/ + install -m 0755 -d $(DESTDIR)/usr/conf/BS/ns/backup_manager/rodata + install -m 0644 $(XML_PATH)/$(BACKUP_XML) $(DESTDIR)/usr/conf/BS/ns/backup_manager/rodata/ include ../../native_service.mk diff --git a/video_in_hal/nsframework/backup_manager/server/src/bkup_param.cpp b/video_in_hal/nsframework/backup_manager/server/src/bkup_param.cpp index 900779b..8d964bb 100755 --- a/video_in_hal/nsframework/backup_manager/server/src/bkup_param.cpp +++ b/video_in_hal/nsframework/backup_manager/server/src/bkup_param.cpp @@ -35,7 +35,7 @@ #include "bkup_util.h" #define BKUP_XML_PATH_MAX 100 -#define BKUP_XML_PATH "/usr/agl/conf/BS/ns/backup_manager/rodata/" +#define BKUP_XML_PATH "/usr/conf/BS/ns/backup_manager/rodata/" #define BKUP_XML_PREFIX "backup_" #define BKUP_XML_EXTENSION ".xml" diff --git a/video_in_hal/nsframework/framework_unified/client/Makefile b/video_in_hal/nsframework/framework_unified/client/Makefile index 29ed628..fec786b 100755 --- a/video_in_hal/nsframework/framework_unified/client/Makefile +++ b/video_in_hal/nsframework/framework_unified/client/Makefile @@ -263,7 +263,7 @@ install-data:install_cfg install -d -m 775 $(DESTDIR)/nv/BS/ns/framework_unified/rwdata install_cfg: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ns/framework_unified/rodata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ns/framework_unified/rodata NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg include ../../native_service.mk diff --git a/video_in_hal/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp b/video_in_hal/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp index 94f775c..f56cb98 100755 --- a/video_in_hal/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp +++ b/video_in_hal/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp @@ -106,7 +106,7 @@ FRAMEWORKUNIFIEDLOGSYSEVENTPARAM g_FrameworkunifiedLogSysEventParams = {FALSE}; #define ZONEMASK_MAX BITS_IN_TZONE // ((UI_32)(BITS_IN_TZONE * TZONE_COUNT)) #define FRAMEWORKUNIFIEDLOG_DEFAULT_FLAG_ID (0) -#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/usr/agl/conf/BS/ns/framework_unified/rodata/ns_logger_frameworkunifiedlog__CWORD84_.cfg" +#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/usr/conf/BS/ns/framework_unified/rodata/ns_logger_frameworkunifiedlog__CWORD84_.cfg" #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__TMP "ns_logger_frameworkunifiedlog__CWORD84_.tmp" #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV "ns_logger_frameworkunifiedlog__CWORD84_.cfg" diff --git a/video_in_hal/nsframework/framework_unified/client/NativeServices/Makefile b/video_in_hal/nsframework/framework_unified/client/NativeServices/Makefile index c346b28..cdc7dff 100755 --- a/video_in_hal/nsframework/framework_unified/client/NativeServices/Makefile +++ b/video_in_hal/nsframework/framework_unified/client/NativeServices/Makefile @@ -23,7 +23,7 @@ all: install-data:install_cfg install_cfg: - install -d -m 775 $(SDKTARGETSYSROOT)/usr/agl/conf/ns_logger - install -m 644 -t $(SDKTARGETSYSROOT)/usr/agl/conf/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg + install -d -m 775 $(SDKTARGETSYSROOT)/usr/conf/ns_logger + install -m 644 -t $(SDKTARGETSYSROOT)/usr/conf/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg include ../../../native_service.mk diff --git a/video_in_hal/nsframework/native_service.mk b/video_in_hal/nsframework/native_service.mk index 729362c..1e83da4 100755 --- a/video_in_hal/nsframework/native_service.mk +++ b/video_in_hal/nsframework/native_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/video_in_hal/nv_hal/Makefile b/video_in_hal/nv_hal/Makefile index 2f2d89f..48ac0cc 100755 --- a/video_in_hal/nv_hal/Makefile +++ b/video_in_hal/nv_hal/Makefile @@ -22,14 +22,14 @@ HEADER := hal_api/nv_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined diff --git a/video_in_hal/otherservice/other_service.mk b/video_in_hal/otherservice/other_service.mk index 85a2f2c..41b7d9d 100755 --- a/video_in_hal/otherservice/other_service.mk +++ b/video_in_hal/otherservice/other_service.mk @@ -39,4 +39,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/video_in_hal/otherservice/rpc_library/tool/Makefile b/video_in_hal/otherservice/rpc_library/tool/Makefile index 8ffd816..bdb7e84 100755 --- a/video_in_hal/otherservice/rpc_library/tool/Makefile +++ b/video_in_hal/otherservice/rpc_library/tool/Makefile @@ -24,8 +24,8 @@ YFLAGS := -d -t LEX := flex LFLAGS := -d -CPPFLAGS := -I../library/include -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h -CFLAGS := -Wall -Wno-unused-function -Wno-unused-variable -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CPPFLAGS := -I../library/include -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h +CFLAGS := -Wall -Wno-unused-function -Wno-unused-variable -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h rpc_apidef: apidef.tab.o lex.yy.o apidef.o $(CXX) $(CPPFLAGS) -o $@ $^ diff --git a/video_in_hal/peripheralservice/peripheral_service.mk b/video_in_hal/peripheralservice/peripheral_service.mk index c054722..3712f49 100755 --- a/video_in_hal/peripheralservice/peripheral_service.mk +++ b/video_in_hal/peripheralservice/peripheral_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/video_in_hal/positioning_hal/Makefile b/video_in_hal/positioning_hal/Makefile index 0b5a74d..837e28b 100755 --- a/video_in_hal/positioning_hal/Makefile +++ b/video_in_hal/positioning_hal/Makefile @@ -25,8 +25,8 @@ CXXFLAGS += -I./inc/Common CXXFLAGS += -I./inc/GpsCommon CXXFLAGS += -I./inc/LineSensDrv CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/ -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/ +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### @@ -37,7 +37,7 @@ CXXFLAGS += -DLINUX -D__CWORD71__VEHICLE_ -D__CWORD71_ LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := /usr/lib diff --git a/video_in_hal/power_hal/Makefile b/video_in_hal/power_hal/Makefile index b0a0c28..e007b63 100755 --- a/video_in_hal/power_hal/Makefile +++ b/video_in_hal/power_hal/Makefile @@ -21,9 +21,9 @@ HEADER := hal_api/power_hal.h ######### include paths/files ################### CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -#CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/stub -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +#CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/stub +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,9 +32,9 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib -RPATH := /usr/agl/lib +RPATH := /usr/lib ######### linked library ######################## LIBS += -Wl,-Bdynamic -lstdc++ diff --git a/video_in_hal/security_hal/Makefile b/video_in_hal/security_hal/Makefile index 5435be7..87f0057 100755 --- a/video_in_hal/security_hal/Makefile +++ b/video_in_hal/security_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/security_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/video_in_hal/soc_temperature_hal/Makefile b/video_in_hal/soc_temperature_hal/Makefile index fa30b35..6904577 100755 --- a/video_in_hal/soc_temperature_hal/Makefile +++ b/video_in_hal/soc_temperature_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/soc_temperature_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/video_in_hal/stub/stub.mk b/video_in_hal/stub/stub.mk index 44fb1e3..c8ff3d3 100755 --- a/video_in_hal/stub/stub.mk +++ b/video_in_hal/stub/stub.mk @@ -38,5 +38,5 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/video_in_hal/systemservice/config/library/system_manager_config/last2order/Makefile b/video_in_hal/systemservice/config/library/system_manager_config/last2order/Makefile index f38ee77..9f9ce40 100755 --- a/video_in_hal/systemservice/config/library/system_manager_config/last2order/Makefile +++ b/video_in_hal/systemservice/config/library/system_manager_config/last2order/Makefile @@ -16,13 +16,13 @@ # ==== Customization ================ #Directory path located XMLs for conversion -CONFXML_DIR_PATH ?= $(SDKTARGETSYSROOT)/usr/agl/conf/sm_last2order +CONFXML_DIR_PATH ?= $(SDKTARGETSYSROOT)/usr/conf/sm_last2order #path to order file -ORDER_DEF_PATH ?= $(SDKTARGETSYSROOT)/usr/agl/include/agl_wakeup_order.h +ORDER_DEF_PATH ?= $(SDKTARGETSYSROOT)/usr/include/agl_wakeup_order.h #path to be installed CFO file -CONF_INSTALL_DIR ?= $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager +CONF_INSTALL_DIR ?= $(SDKTARGETSYSROOT)/usr/conf/systemmanager # ================================== @@ -43,8 +43,8 @@ _all:$(CFOFILES) install:install-pre install-cfo install-pre: - install -d -m 775 $(DESTDIR)/usr/agl/conf/sm_last2order;\ - install -m 644 -t $(DESTDIR)/usr/agl/conf/systemmanager sm_last2order.cfo + install -d -m 775 $(DESTDIR)/usr/conf/sm_last2order;\ + install -m 644 -t $(DESTDIR)/usr/conf/systemmanager sm_last2order.cfo install-cfo:_all set -e ;\ diff --git a/video_in_hal/systemservice/config/library/system_manager_config/order/Makefile b/video_in_hal/systemservice/config/library/system_manager_config/order/Makefile index 38af0ee..8681a7c 100755 --- a/video_in_hal/systemservice/config/library/system_manager_config/order/Makefile +++ b/video_in_hal/systemservice/config/library/system_manager_config/order/Makefile @@ -18,14 +18,14 @@ HOST_CPP = cpp HOST_ORDER_XML2CFG = ./launch_order_xml2cfg.pl -CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf -CONF_WON_H = $(SDKTARGETSYSROOT)/usr/agl/include/agl_wakeup_order.h +CONF_DIR = $(SDKTARGETSYSROOT)/usr/conf +CONF_WON_H = $(SDKTARGETSYSROOT)/usr/include/agl_wakeup_order.h LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml) ORDER_XMLFILES = $(LAUNCH_XMLFILES:%.xml=%.order) ORDER_CFGFILES = $(ORDER_XMLFILES:%.order=%.order.cfg) -INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager +INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/conf/systemmanager CLEAN_FILES = launch_order_body.xml $(ORDER_CFGFILES) @@ -35,7 +35,7 @@ VPATH += ../xml install:install-pre install-cfg install-pre: - install -m 644 -t $(DESTDIR)/usr/agl/conf/sm_launch system_launcher_main.xml + install -m 644 -t $(DESTDIR)/usr/conf/sm_launch system_launcher_main.xml install-cfg:$(ORDER_CFGFILES) set -e ;\ diff --git a/video_in_hal/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp b/video_in_hal/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp index 16ec02a..db8e50c 100755 --- a/video_in_hal/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp +++ b/video_in_hal/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp @@ -130,7 +130,7 @@ static EFrameworkunifiedStatus setEvnVariableForLaunchConfigFile(std::string f_s l_pLaunchConfigFile = LaunchConfigFileName2; } - std::string cnfPath = "/usr/agl/conf/BS/ss/system_manager/rwdata/"; + std::string cnfPath = "/usr/conf/BS/ss/system_manager/rwdata/"; cnfPath += l_pLaunchConfigFile; if (access(cnfPath.c_str(), F_OK) != 0) { l_pLaunchConfigFile = LaunchConfigFileName1; @@ -301,7 +301,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) { SS_ASERT(configRet == eFrameworkunifiedStatusOK); // Set PRODUCT version information - const char prdVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/version.txt"; + const char prdVersion[] = "/usr/share/BS/ss/system_manager/rodata/version.txt"; { std::string line; std::ifstream prdFin(prdVersion); @@ -327,7 +327,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) { } // PHASE_INFO - const char phaseVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/PhaseInfo.txt"; + const char phaseVersion[] = "/usr/share/BS/ss/system_manager/rodata/PhaseInfo.txt"; { configRet = setVerInfo_version_date(phaseVersion); } diff --git a/video_in_hal/systemservice/config/library/system_manager_config/xml/Makefile b/video_in_hal/systemservice/config/library/system_manager_config/xml/Makefile index e11288c..6b07d29 100755 --- a/video_in_hal/systemservice/config/library/system_manager_config/xml/Makefile +++ b/video_in_hal/systemservice/config/library/system_manager_config/xml/Makefile @@ -18,13 +18,13 @@ HOST_CPP = cpp HOST_LAUNCH_XML2CFG = ./launch_xml2cfg.sh -CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf -CONF_THREAD_H = $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h +CONF_DIR = $(SDKTARGETSYSROOT)/usr/conf +CONF_THREAD_H = $(SDKTARGETSYSROOT)/usr/include/agl_thread.h LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml) LAUNCH_CFGFILES = $(LAUNCH_XMLFILES:%.xml=%.cfg) -INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager +INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/conf/systemmanager CLEAN_FILES = system_launcher_body.xml $(LAUNCH_CFGFILES) @@ -33,10 +33,10 @@ VPATH = $(CONF_DIR)/sm_launch install:install-pre install-cfg install-pre: - install -d -m 775 $(DESTDIR)/usr/agl/conf;\ - install -d -m 775 $(DESTDIR)/usr/agl/conf/sm_launch;\ - install -d -m 775 $(DESTDIR)/usr/agl/conf/systemmanager;\ - install -m 644 -t $(DESTDIR)/usr/agl/conf/sm_launch sm_launch_agl.xml + install -d -m 775 $(DESTDIR)/usr/conf;\ + install -d -m 775 $(DESTDIR)/usr/conf/sm_launch;\ + install -d -m 775 $(DESTDIR)/usr/conf/systemmanager;\ + install -m 644 -t $(DESTDIR)/usr/conf/sm_launch sm_launch_agl.xml install-cfg:$(LAUNCH_CFGFILES) set -e ;\ diff --git a/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg b/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg index 876ab41..e1c544a 100755 --- a/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg +++ b/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg @@ -1,7 +1,7 @@ # This file is created from sm_launch_agl.xml.tmp. # created date : Tue Aug 29 13:31:32 JST 2017 [ModulesLaunchConfig] -Launch1=CoreModules|1|0|False|NS_NPPService|/usr/agl/bin/NS_NPPService|25|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000|| -Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/agl/bin/NS_BackupMgr|25|True|0|-l console|NULL|NULL|True|True|15|1000|| +Launch1=CoreModules|1|0|False|NS_NPPService|/usr/bin/NS_NPPService|25|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000|| +Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/bin/NS_BackupMgr|25|True|0|-l console|NULL|NULL|True|True|15|1000|| Launch3=SS_Logger|2|0|False|SS_DevDetectSrv|/tmp/SS_DeviceDetectionService|20|True|0|-l console|NULL|NULL|True|False|1|1000|| -Launch4=SS_Logger|2|0|False|SS_LoggerSrv|/usr/agl/bin/SS_LoggerService|0|True|0|-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10|NULL|NULL|True|True|10|1000|| +Launch4=SS_Logger|2|0|False|SS_LoggerSrv|/usr/bin/SS_LoggerService|0|True|0|-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10|NULL|NULL|True|True|10|1000|| diff --git a/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml b/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml index a433be3..6560832 100755 --- a/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml +++ b/video_in_hal/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml @@ -1,14 +1,14 @@ <!-- group_id=1 --> <group name="CoreModules" wait_time="0" trigger="False" > <launch - name="NS_NPPService" path="/usr/agl/bin/NS_NPPService" priority="25" + name="NS_NPPService" path="/usr/bin/NS_NPPService" priority="25" critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2" logging_mask="NULL" restart="NULL" is_start_required="False" shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000" user_name="" /> <launch - name="NS_BackupMgr" path="/usr/agl/bin/NS_BackupMgr" priority="25" + name="NS_BackupMgr" path="/usr/bin/NS_BackupMgr" priority="25" critical="True" retry_cnt="0" arguments="-l console" logging_mask="NULL" restart="NULL" is_start_required="True" shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000" @@ -25,7 +25,7 @@ user_name="" /> <launch - name="SS_LoggerSrv" path="/usr/agl/bin/SS_LoggerService" priority="0" + name="SS_LoggerSrv" path="/usr/bin/SS_LoggerService" priority="0" critical="True" retry_cnt="0" arguments="-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10" logging_mask="NULL" restart="NULL" is_start_required="True" shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000" diff --git a/video_in_hal/systemservice/interface_unified/Makefile.client b/video_in_hal/systemservice/interface_unified/Makefile.client index de16e15..06a6ebd 100755 --- a/video_in_hal/systemservice/interface_unified/Makefile.client +++ b/video_in_hal/systemservice/interface_unified/Makefile.client @@ -19,14 +19,14 @@ SUBDIRS := library install:install_cfg install_cfg_pram install_cfg_pram: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg install_cfg: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata scfg/ss_logger.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/power_service/rodata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/logger_service/rodata + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/logger_service/rodata scfg/ss_logger.cfg include ../system_service.mk diff --git a/video_in_hal/systemservice/interface_unified/library/include/ss_last_to_order_local.h b/video_in_hal/systemservice/interface_unified/library/include/ss_last_to_order_local.h index 889a733..6a918e8 100755 --- a/video_in_hal/systemservice/interface_unified/library/include/ss_last_to_order_local.h +++ b/video_in_hal/systemservice/interface_unified/library/include/ss_last_to_order_local.h @@ -33,7 +33,7 @@ #include <string> -#define SS_LAST_TO_ORDER_CONF_PATH "/usr/agl/conf/BS/ss/system_manager/rodata/sm_last2order.cfo" +#define SS_LAST_TO_ORDER_CONF_PATH "/usr/conf/BS/ss/system_manager/rodata/sm_last2order.cfo" #endif // INTERFACE_UNIFIED_LIBRARY_INCLUDE_SS_LAST_TO_ORDER_LOCAL_H_ /** @}*/ diff --git a/video_in_hal/systemservice/logger_service/server/SS_LoggerService.conf_bin b/video_in_hal/systemservice/logger_service/server/SS_LoggerService.conf_bin index 440d361..0fe3783 100755 --- a/video_in_hal/systemservice/logger_service/server/SS_LoggerService.conf_bin +++ b/video_in_hal/systemservice/logger_service/server/SS_LoggerService.conf_bin @@ -1,4 +1,4 @@ -/usr/agl/bin|${OSW_reldbg} +/usr/bin|${OSW_reldbg} debug|dbg release|rel product|rel diff --git a/video_in_hal/systemservice/logger_service/server/include/ss_logger_scrshot.h b/video_in_hal/systemservice/logger_service/server/include/ss_logger_scrshot.h index 5cc9dd9..3cd22a6 100755 --- a/video_in_hal/systemservice/logger_service/server/include/ss_logger_scrshot.h +++ b/video_in_hal/systemservice/logger_service/server/include/ss_logger_scrshot.h @@ -24,7 +24,7 @@ #define JPEG_PATH_CH0 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg" #define JPEG_PATH_CH1 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg" -#define SCRSHOT_EXE_PATH "/usr/agl/bin/SS_ScrShot" +#define SCRSHOT_EXE_PATH "/usr/bin/SS_ScrShot" #define SCREEN_SHOT_PATH "/nv/BS/ss/logger_service/rwdata/screenShot" #endif // LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ diff --git a/video_in_hal/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp b/video_in_hal/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp index 2bd8b79..ec084ab 100755 --- a/video_in_hal/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp +++ b/video_in_hal/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp @@ -51,7 +51,7 @@ #include "ss_logger_store_logs_loggerservicelog.h" #include "ss_logger_cfg.h" -#define LOGGERSERVICELOG_CONFIG_PATH "/usr/agl/conf/BS/ss/logger_service/rodata/ss_logger.cfg" +#define LOGGERSERVICELOG_CONFIG_PATH "/usr/conf/BS/ss/logger_service/rodata/ss_logger.cfg" #define LOGGER_TMP_FN "__LOGGER.tmp" #define LOGGERSERVICELOG_TMP_OUTPUT_PATH "/tmp" #define PSTORE_DIR_PATH "/dev/pstore" diff --git a/video_in_hal/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin b/video_in_hal/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin index 440d361..0fe3783 100755 --- a/video_in_hal/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin +++ b/video_in_hal/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin @@ -1,4 +1,4 @@ -/usr/agl/bin|${OSW_reldbg} +/usr/bin|${OSW_reldbg} debug|dbg release|rel product|rel diff --git a/video_in_hal/systemservice/logger_service/server/src/loggerservice_application.cpp b/video_in_hal/systemservice/logger_service/server/src/loggerservice_application.cpp index 2d39fb2..3ea6250 100755 --- a/video_in_hal/systemservice/logger_service/server/src/loggerservice_application.cpp +++ b/video_in_hal/systemservice/logger_service/server/src/loggerservice_application.cpp @@ -178,7 +178,7 @@ EFrameworkunifiedStatus FrameworkunifiedOnInitialization(HANDLE hApp) { LOG_STATUS_IF_ERRORED(l_eStatus, "g_loggerCfg.Initialize()"); // LCOV_EXCL_BR_LINE 15: macro std::string l_cfgFilePathAndName = - "/usr/agl/conf/BS/ss/logger_service/rodata/ss_logger.cfg"; + "/usr/conf/BS/ss/logger_service/rodata/ss_logger.cfg"; if (eFrameworkunifiedStatusOK != (l_eStatus = g_loggerCfg.Load(l_cfgFilePathAndName))) { // LCOV_EXCL_BR_LINE 200:To ensure success // LCOV_EXCL_START 200:To ensure success AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert diff --git a/video_in_hal/systemservice/power_service/server/src/ss_power.cpp b/video_in_hal/systemservice/power_service/server/src/ss_power.cpp index 26e8881..2e75b3d 100755 --- a/video_in_hal/systemservice/power_service/server/src/ss_power.cpp +++ b/video_in_hal/systemservice/power_service/server/src/ss_power.cpp @@ -135,7 +135,7 @@ EFrameworkunifiedStatus Power::Initialize(HANDLE h_app) { pthread_mutex_init(&pwr_hist_mutex, NULL); /// Open and parse the configuration data for Power - const CHAR configFileName[] = "/usr/agl/conf/BS/ss/power_service/rodata/gpf_ss_ps_config.cfg"; + const CHAR configFileName[] = "/usr/conf/BS/ss/power_service/rodata/gpf_ss_ps_config.cfg"; PowerConfiguration config(configFileName); l_SpecifiedCfgLoaded = config.LoadParameters(m_tConfigData); diff --git a/video_in_hal/systemservice/resource_manager/server/src/resm.cpp b/video_in_hal/systemservice/resource_manager/server/src/resm.cpp index 41caa19..6bed6bd 100755 --- a/video_in_hal/systemservice/resource_manager/server/src/resm.cpp +++ b/video_in_hal/systemservice/resource_manager/server/src/resm.cpp @@ -90,9 +90,9 @@ CFrameworkunifiedVersion g_FrameworkunifiedVersion(MAJORNO, MINORNO, REVISION); #define DEBUG_INFO_CPU_TOP_LINES (10) #define DEBUG_INFO_CMA_MIN (160000) // in KB #define DEBUG_INFO_CMA_LETTERS (20) -#define DEBUG_INFO_DSP_PG_PATH "/usr/agl/bin/bs_analysis_dispinfo_debug" +#define DEBUG_INFO_DSP_PG_PATH "/usr/bin/bs_analysis_dispinfo_debug" -#define DROP_CACHES_PG_PATH "/usr/agl/bin/drop_caches" +#define DROP_CACHES_PG_PATH "/usr/bin/drop_caches" #define READLINE_MAX_SIZE 512 #define READ_MAX_SIZE 4096 diff --git a/video_in_hal/systemservice/system_manager/server/Makefile b/video_in_hal/systemservice/system_manager/server/Makefile index 04185f9..4793ba8 100755 --- a/video_in_hal/systemservice/system_manager/server/Makefile +++ b/video_in_hal/systemservice/system_manager/server/Makefile @@ -106,13 +106,13 @@ LINK_CXX=Y install-data: install_data install_data: - cpp -P -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml - $(SDKTARGETSYSROOT)/usr/agl/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg - install -d -m 755 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata - install -m 644 ./sm_launch.cfg $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata + cpp -P -include $(SDKTARGETSYSROOT)/usr/include/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml + $(SDKTARGETSYSROOT)/usr/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg + install -d -m 755 $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata + install -m 644 ./sm_launch.cfg $(DESTDIR)/usr/conf/BS/ss/system_manager/rwdata install -d -m 755 $(DESTDIR)/nv/BS/ss/system_manager/rwdata - install -d -m 755 $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata - install -m 644 ./version.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata - install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata + install -d -m 755 $(DESTDIR)/usr/share/BS/ss/system_manager/rodata + install -m 644 ./version.txt $(DESTDIR)/usr/share/BS/ss/system_manager/rodata + install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/share/BS/ss/system_manager/rodata include ../../system_service.mk diff --git a/video_in_hal/systemservice/system_manager/server/include/ss_sm_default_paths.h b/video_in_hal/systemservice/system_manager/server/include/ss_sm_default_paths.h index 8ffafd9..5f8ab88 100755 --- a/video_in_hal/systemservice/system_manager/server/include/ss_sm_default_paths.h +++ b/video_in_hal/systemservice/system_manager/server/include/ss_sm_default_paths.h @@ -34,7 +34,7 @@ const CHAR UsingVMPlayerVariable[] = "USING_VM_PLAYER"; */ const CHAR DefaultBasePath[] = ""; const CHAR DefaultBinaryPath[] = "/agl/bin/"; -const CHAR DefaultConfigFilesPath[] = "/usr/agl/conf/BS/ss/system_manager/rwdata/"; +const CHAR DefaultConfigFilesPath[] = "/usr/conf/BS/ss/system_manager/rwdata/"; const CHAR DefaultLaunchConfigFileName[] = "sm_launch.cfg"; const CHAR DefaultSMConfigFileName[] = "gpf_ss_sm_config_data.cfg"; diff --git a/video_in_hal/systemservice/system_manager/server/sm_launch__CWORD84_.xml b/video_in_hal/systemservice/system_manager/server/sm_launch__CWORD84_.xml index 1392bbb..ab49871 100755 --- a/video_in_hal/systemservice/system_manager/server/sm_launch__CWORD84_.xml +++ b/video_in_hal/systemservice/system_manager/server/sm_launch__CWORD84_.xml @@ -1,14 +1,14 @@ <!-- group_id=1 -->
<group name="CoreModules" wait_time="0" trigger="False" >
<launch
- name=MN_NS_NPPSERVICE path="/usr/agl/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S
+ name=MN_NS_NPPSERVICE path="/usr/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S
critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2"
restart="NULL" is_start_required="False"
shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
user_name=""
/>
<launch
- name=MN_NS_BACKUPMGR path="/usr/agl/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S
+ name=MN_NS_BACKUPMGR path="/usr/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000"
@@ -18,7 +18,7 @@ <!-- group_id=2 -->
<group name="SS_Logger" wait_time="0" trigger="False" >
<launch
- name=MN_SS_LOGGERSRV path="/usr/agl/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S
+ name=MN_SS_LOGGERSRV path="/usr/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S
critical="True" retry_cnt="0" arguments="-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10"
restart="NULL" is_start_required="True"
shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000"
@@ -35,7 +35,7 @@ because the LOG save processing is performed by the GROUP2 termination processing of SS_LoggerService.
-->
<launch
- name=MN_COMMUNICATION path="/usr/agl/bin/communication" priority=PR_COMMUNICATION_S
+ name=MN_COMMUNICATION path="/usr/bin/communication" priority=PR_COMMUNICATION_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
@@ -46,7 +46,7 @@ <!-- group_id=4 -->
<group name="VehicleModules" wait_time="0" trigger="False" >
<launch
- name=MN_POSITIONING path="/usr/agl/bin/Positioning" priority=PR_POSITIONING_S
+ name=MN_POSITIONING path="/usr/bin/Positioning" priority=PR_POSITIONING_S
critical="True" retry_cnt="0" arguments="NULL"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
@@ -57,21 +57,21 @@ <!-- group_id=5 -->
<group name="SystemModules" wait_time="0" trigger="False" >
<launch
- name=MN_SS_POWERSERVICE path="/usr/agl/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S
+ name=MN_SS_POWERSERVICE path="/usr/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
user_name=""
/>
<launch
- name=MN_SS_TASKMANAGER path="/usr/agl/bin/tskmgr" priority=PR_SS_TASKMANAGER_S
+ name=MN_SS_TASKMANAGER path="/usr/bin/tskmgr" priority=PR_SS_TASKMANAGER_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="True" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
user_name=""
/>
<launch
- name=MN_SS_RESOURCEMGR path="/usr/agl/bin/resm" priority=PR_SS_RESOURCEMGR_S
+ name=MN_SS_RESOURCEMGR path="/usr/bin/resm" priority=PR_SS_RESOURCEMGR_S
critical="True" retry_cnt="0" arguments="-l console"
restart="NULL" is_start_required="True"
shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
diff --git a/video_in_hal/systemservice/system_manager/server/src/ss_system_manager.cpp b/video_in_hal/systemservice/system_manager/server/src/ss_system_manager.cpp index 8e26f23..b767ed7 100755 --- a/video_in_hal/systemservice/system_manager/server/src/ss_system_manager.cpp +++ b/video_in_hal/systemservice/system_manager/server/src/ss_system_manager.cpp @@ -96,7 +96,7 @@ using namespace std; // NOLINT static CSystemManager g_oSystemManger; #define SS_SM_TEMP_FILE_FOR_STORE_LOGS "/nv/BS/ss/system_manager/rwdata/sm_tempStoreLogs" -#define TR_USB_PATH "/usr/agl/bin/realtimeUsbLog" +#define TR_USB_PATH "/usr/bin/realtimeUsbLog" // \brief: public structure that is used for logging by NSLogger. FRAMEWORKUNIFIEDLOGPARAM g_FrameworkunifiedLogParams = { diff --git a/video_in_hal/systemservice/system_service.mk b/video_in_hal/systemservice/system_service.mk index 5444eb4..ec90250 100755 --- a/video_in_hal/systemservice/system_service.mk +++ b/video_in_hal/systemservice/system_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk diff --git a/video_in_hal/systemservice/task_manager/client/libtskmcfg/Makefile b/video_in_hal/systemservice/task_manager/client/libtskmcfg/Makefile index 9fe2ed3..18b1f46 100755 --- a/video_in_hal/systemservice/task_manager/client/libtskmcfg/Makefile +++ b/video_in_hal/systemservice/task_manager/client/libtskmcfg/Makefile @@ -45,8 +45,8 @@ install:install-pre install-pre-header build-lib:install-pre install-pre-header install-lib:install-pre install-pre-header install-pre: - install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/task_manager/rodata;\ - install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/task_manager/rodata $(WAKESHUTCONF_DIR)/tskm_launch.xml;\ + install -d -m 775 $(DESTDIR)/usr/conf/BS/ss/task_manager/rodata;\ + install -m 644 -t $(DESTDIR)/usr/conf/BS/ss/task_manager/rodata $(WAKESHUTCONF_DIR)/tskm_launch.xml;\ CONFIG_FILES:=tskm_wakeup.xml tskm_shutdown.xml tskm_wakeup_vup.xml tskm_shutdown_vup.xml tskm_launch.xml tskm_svcid.h agl_thread.h @@ -79,7 +79,7 @@ agl_thread.h:$(WAKESHUTCONF_DIR)/agl_thread.h tskm_launch.xml:$(WAKESHUTCONF_DIR)/tskm_launch.xml agl_thread.h $(HOST_CPP) -P -include agl_thread.h $< > $@ -#tskm_launch.xml:$(SVCONF_DIR)/tskm_launch.xml $(SDKTARGETSYSROOT)/usr/agl/include/agl_thread.h +#tskm_launch.xml:$(SVCONF_DIR)/tskm_launch.xml $(SDKTARGETSYSROOT)/usr/include/agl_thread.h # $(HOST_CPP) -P -include agl_thread.h $< > $@ $(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES) diff --git a/video_in_hal/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml b/video_in_hal/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml index d4ab06c..a7d7273 100755 --- a/video_in_hal/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml +++ b/video_in_hal/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml @@ -2,7 +2,7 @@ <service svcid="TSKM_SVCID_ACTIVITYMGR" name=MN_ACTIVITYMANAGER - path="/usr/agl/bin/acmsrv" + path="/usr/bin/acmsrv" prio=PR_ACTIVITYMANAGER_S policy="tss" life_cycle="always" @@ -12,7 +12,7 @@ <service svcid="TSKM_SVCID_TE_RESIDENT" name=MN_RESIDENT_SVC - path="/usr/agl/bin/resident" + path="/usr/bin/resident" prio=PR_RESIDENT_SVC_S policy="tss" life_cycle="always" @@ -22,7 +22,7 @@ <service svcid="TSKM_SVCID_TE_TRANSIENT" name =MN_TRANSIENT_SVC - path="/usr/agl/bin/transient" + path="/usr/bin/transient" prio=PR_TRANSIENT_SVC_S policy="tss" user="" @@ -32,7 +32,7 @@ <service svcid="TSKM_SVCID__CWORD58_" name =MN__CWORD58_SERVICE - path="/usr/agl/bin/_CWORD58_Service" + path="/usr/bin/_CWORD58_Service" prio=PR__CWORD58_SERVICE_S policy="tss" retry_cnt="-1" @@ -60,7 +60,7 @@ <service svcid="TSKM_SVCID_XMVUPSRV" name =MN_XMVUPSERVICE - path="/usr/agl/bin/radio_xm_update" + path="/usr/bin/radio_xm_update" prio=PR_XMVUPSERVICE_S policy="tss" user="" @@ -69,7 +69,7 @@ <service svcid="TSKM_SVCID_BTPHONESRV" name =MN_BTPHONESRV - path="/usr/agl/bin/BT_PhoneSrv" + path="/usr/bin/BT_PhoneSrv" prio=PR_BTPHONESRV_S policy="tss" user="" @@ -78,7 +78,7 @@ <service svcid="TSKM_SVCID_BTPBKSRV" name =MN_BTPBKSRV - path="/usr/agl/bin/BT_PbkSrv" + path="/usr/bin/BT_PbkSrv" prio=PR_BTPBKSRV_S policy="tss" user="" @@ -87,7 +87,7 @@ <service svcid="TSKM_SVCID_BTMSGSRV" name =MN_BTMSGSRV - path="/usr/agl/bin/BT_MsgSrv" + path="/usr/bin/BT_MsgSrv" prio=PR_BTMSGSRV_S policy="tss" user="" @@ -96,7 +96,7 @@ <service svcid="TSKM_SVCID_DTVVUPSRV" name =MN_DTVVUPSERVICE - path="/usr/agl/bin/DtvVupService" + path="/usr/bin/DtvVupService" prio=PR_DTVVUPSERVICE_S policy="tss" user="" diff --git a/video_in_hal/usb_hal/Makefile b/video_in_hal/usb_hal/Makefile index 1a107ce..54ec566 100755 --- a/video_in_hal/usb_hal/Makefile +++ b/video_in_hal/usb_hal/Makefile @@ -22,8 +22,8 @@ HEADER := ./hal_api/usb_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := diff --git a/video_in_hal/vehicle_hal/Makefile b/video_in_hal/vehicle_hal/Makefile index d009b13..208732d 100755 --- a/video_in_hal/vehicle_hal/Makefile +++ b/video_in_hal/vehicle_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/vehicle_hal.h ######### include paths/files ################### CXXFLAGS := -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h +CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include +CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/agl_types_obsoluted.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib RPATH := /usr/lib diff --git a/video_in_hal/vehicleservice/positioning/server/src/Sensor/Makefile b/video_in_hal/vehicleservice/positioning/server/src/Sensor/Makefile index bb70229..10fb647 100755 --- a/video_in_hal/vehicleservice/positioning/server/src/Sensor/Makefile +++ b/video_in_hal/vehicleservice/positioning/server/src/Sensor/Makefile @@ -155,7 +155,7 @@ CPPFLAGS += -I../ServiceInterface/VehicleIf CPPFLAGS += -I../nsfw/include #CPPFLAGS += -I../../../../diag_code/library/include -CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include/vehicle_service +CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/vehicle_service ######### add compile option ############# CPPFLAGS += -DLINUX diff --git a/video_in_hal/vehicleservice/vehicle_service.mk b/video_in_hal/vehicleservice/vehicle_service.mk index 40d337f..a919901 100755 --- a/video_in_hal/vehicleservice/vehicle_service.mk +++ b/video_in_hal/vehicleservice/vehicle_service.mk @@ -39,4 +39,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/agl.mk |