Fixup! [Tizen 3.0][Mobile] Use the prebuilt gold instead of the system gold

Original patch prevents requiring binutils-gold from tizen v3.0 emulator and tv,
and it causes following build error.

>> [  XXXs] collect2: fatal error: cannot find 'ld'

Original patch: http://165.213.202.130/gerrit/#/c/80546/

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=13107
Reviewed by: Antonio Gomes, SeungSeop Park

Change-Id: I21c6e32572b07cf63302475f72f5a44503ef7781
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/tizen_src/build/gyp_chromiumefl.sh b/tizen_src/build/gyp_chromiumefl.sh
index 5cbc558..894ea6a 100755 (executable)
--- a/tizen_src/build/gyp_chromiumefl.sh
+++ b/tizen_src/build/gyp_chromiumefl.sh
@@ -109,25 +109,23 @@ add_tizen_flags() {
                               -Ddisable_nacl=1
                              "
 
-  if [ "$tizen_version" == "2.2.1" -o "$tizen_version" == "2.3" ]; then
-    COMMON_GYP_PARAMETERS+="-Dtizen_multimedia_support=0
-                           "
+  # TODO(youngsoo): Once binutils-gold issue on tizen v3.0 mobile is fixed by platform team,
+  #                 Please make the latest tizen version unconditional.
+  if [ "$tizen_version" == "3.0" ] && [ "$target" == "tv" ]; then
+    ADDITIONAL_GYP_PARAMETERS+="-Dlinux_use_gold_flags=1
+                               "
+  else
     ADDITIONAL_GYP_PARAMETERS+="-Dlinux_use_gold_flags=0
                                 -Dprebuilt_ld_gold_dir=${TOPDIR}/tizen_src/build/prebuild
                                "
-  else
+  fi
+
+  if [ "$tizen_version" != "2.2.1" -a "$tizen_version" != "2.3" ]; then
     COMMON_GYP_PARAMETERS+="-Dtizen_multimedia_support=1
                            "
-    # TODO : Using the binutils-gold had a crash in the Tizen 3.0 Mobile Note4 device (64 bit)
-    #        It will be removed after fixing the problem by Platform team.
-    if [ "$tizen_version" == "3.0" ] && [ "$target" == "mobile" ]; then
-      ADDITIONAL_GYP_PARAMETERS+="-Dlinux_use_gold_flags=0
-                                  -Dprebuilt_ld_gold_dir=${TOPDIR}/tizen_src/build/prebuild
-                                 "
-    else
-      ADDITIONAL_GYP_PARAMETERS+="-Dlinux_use_gold_flags=1
-                                 "
-    fi
+  else
+    COMMON_GYP_PARAMETERS+="-Dtizen_multimedia_support=0
+                           "
   fi
 
   if [ "$target" == "mobile" ]; then

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index 4220c50..f008100 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -157,15 +157,15 @@ BuildRequires: pkgconfig(ttrace)
 %else # for TV
 BuildRequires: pkgconfig(audio-session-mgr)
 BuildRequires: pkgconfig(mm-session)
+# TODO(youngsoo): The binutils-gold crashes mini_browser on the Tizen v3.0 mobile target(Note4 64 bit).
+#                 Please move the binutils-gold for all targets on Tizen v3.0.
+%if "%{chromium_efl_tizen_version}" == "3.0"
+BuildRequires: binutils-gold
+%endif
 %endif
 
 # Version Conditions for Every Targets
 %if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" >= "2.4"
-# TODO : Using the binutils-gold had a crash in the Tizen 3.0 Mobile Note4 device (64 bit)
-#        It will be removed after fixing the problem by Platform team.
-%if "%{chromium_efl_tizen_version}" != "3.0" && "%{chromium_efl_tizen_profile}" != "mobile"
-BuildRequires: binutils-gold
-%endif
 BuildRequires: pkgconfig(gstreamer-1.0)
 BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires: pkgconfig(gstreamer-app-1.0)