Merge remote-tracking branch 'origin/sandbox/ruke47/complete_build' into origin/sandbox/Riku.Nomoto/WIP_fixpathsandbox/Riku.Nomoto/WIP_fixpath

Change-Id: I3e736aa35f02c87239bce1e4d15d4f8ae37e9926

2 files changed, 20 insertions, 4 deletions

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: