From: Michal Jurkiewicz <m.jurkiewicz@samsung.com>
Date: Thu, 4 Mar 2021 10:27:39 +0000 (+0100)
Subject: [M108 Migration][Build system] Fix desktop build break
X-Git-Tag: submit/tizen/20230324.160014~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb359988e5c2483730d60699884f4803811284a9;p=platform%2Fframework%2Fweb%2Fchromium-efl.git

[M108 Migration][Build system] Fix desktop build break

Ported patch from tizen_7.0:
  https://review.tizen.org/gerrit/c/platform/framework/web/chromium-efl/+/273992

Bug: https://cam.sprc.samsung.pl/browse/VDWASM-1212
Change-Id: Ibe04d0d760152080566638d6569705c5ee960e91
Signed-off-by: Michal Jurkiewicz <m.jurkiewicz@samsung.com>
---

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 4853132..2635217 100755
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -188,6 +188,7 @@ function hostGnChromiumEfl() {
 }
 
 function hostNinja() {
+  local RESULT=0
   if [[ $SKIP_NINJA == 0 ]]; then
     if [[ $BUILD_CHROME == 1 ]]; then
       TARGETS="content_shell chrome"
@@ -203,8 +204,13 @@ function hostNinja() {
     export BUILD_SUBDIRECTORY=""
     BUILDDIR=${GN_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY}
     ninja -C $BUILDDIR ${JOBS} ${TARGETS}
+    RESULT=$?
   fi
   undoReplacedGn $1
+
+  if [[ $RESULT != 0 ]]; then
+    exit $RESULT
+  fi
 }
 
 function error_report() {
@@ -386,9 +392,14 @@ function setupAndExecuteTargetBuild() {
 
   processICU initialize_icu
   gbs $CONF_FLAG build -P $PROFILE --include-all -A $ARCHITECTURE "${ARGS[@]}" $BUILD_CONF_OPTS --incremental $GBS_ROOT_OPT
+  local RESULT=$?
 
   undoReplacedGn $platform
   processICU restore_icu
+
+  if [[ $RESULT != 0 ]]; then
+    exit $RESULT
+  fi
 }
 
 function processICU() {