From 7ab637d7f01e712488deab0d318443ed9a81d5ae Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Thu, 26 Nov 2020 10:39:39 +0900 Subject: [PATCH] Fix unresolve build dependency Fix the inconsistencies in subdirectories and library dependencies between libNS_FrameworkUnfied.so and libNS_XMLConfigParse.so Signed-off-by: Tadao Tanikawa Change-Id: I921e666ecfa4e31cc6a78568e8e9bdc53f5466fd --- service/native/framework_unified/Makefile.library | 19 +++++++++++++++++++ service/native/framework_unified/client/Makefile | 5 +---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100755 service/native/framework_unified/Makefile.library diff --git a/service/native/framework_unified/Makefile.library b/service/native/framework_unified/Makefile.library new file mode 100755 index 0000000..e689fa9 --- /dev/null +++ b/service/native/framework_unified/Makefile.library @@ -0,0 +1,19 @@ +# +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +SUBDIRS := client/NS_XMLConfigeParser + +include ../native_service.mk diff --git a/service/native/framework_unified/client/Makefile b/service/native/framework_unified/client/Makefile index ce4b2dd..da440d8 100755 --- a/service/native/framework_unified/client/Makefile +++ b/service/native/framework_unified/client/Makefile @@ -252,10 +252,7 @@ LINK_SHLIB_CXX = Y # buildversioncheck INST_HEADERS += ns_buildversioncheck.hpp - -SUBDIRS := NS_XMLConfigeParser NS_Utility - - +SUBDIRS := NS_Utility all: -- 2.16.6