Remove duplicated build rules

The following build flags are already the default for common trunk (see build/supplement.gypi):
 - use_kerberos=0
 - enable_automation=0
 - remoting=0
 - enable_google_now=0
 - use_cups=0

Removed enable_language_detection as this is no longer used anywhere.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=4403

Signed-off-by: Laszlo Gombos <l.gombos@samsung.com>
Change-Id: I2c9fc21af05b42f5e9f99e4302a9aceaff8487c3

diff --git a/tizen_src/build/envsetup.sh b/tizen_src/build/envsetup.sh
index 55286d222766761ee913c2705dac8a0883b7b4a0..3a637698419477a0e7b2546f401f7f55ba520865 100644 (file)
--- a/tizen_src/build/envsetup.sh
+++ b/tizen_src/build/envsetup.sh
@@ -75,9 +75,8 @@ python_ver=$(python --version  2>&1 | sed -e 's/Python \([0-9]\+\.[0-9]\+\)\.[0-
 
 DEFINES="OS=linux"
 DEFINES+=" host_os=${host_os} host_arch=${host_arch} python_ver=${python_ver}"
-DEFINES+=" use_libjpeg_turbo=0 use_kerberos=0 enable_automation=0 remoting=0"
-DEFINES+=" enable_google_now=0 enable_language_detection=0 proprietary_codecs=1"
-DEFINES+=" use_cups=0 use_xi2_mt=2 toolkit_uses_gtk=0 use_aura=1 toolkit_efl=1"
+DEFINES+=" use_libjpeg_turbo=0 proprietary_codecs=1"
+DEFINES+=" use_xi2_mt=2 toolkit_uses_gtk=0 use_aura=1 toolkit_efl=1"
 DEFINES+=" use_gstreamer=1"
 
 echo "[M37] TODO: Fix and re-enable notifications (edit build/envsetup.sh)"

diff --git a/tizen_src/build/prebuild_desktop.sh b/tizen_src/build/prebuild_desktop.sh
index 1084a6b06eb2764be058b29ae325f2039f5dbb0d..16e8442c58c2a8f172710442cd8f7d54dece3e5d 100755 (executable)
--- a/tizen_src/build/prebuild_desktop.sh
+++ b/tizen_src/build/prebuild_desktop.sh
@@ -38,13 +38,7 @@ ${TOPDIR}/build/gyp_chromiumefl --depth=${TOPDIR}/src -I${TOPDIR}/impl/chromium-
                                  -Defl_impl_dir=${TOPDIR}/impl \
                                  -DOS=linux \
                                  -Duse_libjpeg_turbo=0 \
-                                 -Duse_kerberos=0 \
-                                 -Denable_automation=0 \
-                                 -Dremoting=0 \
-                                 -Denable_google_now=0 \
-                                 -Denable_language_detection=0 \
                                  -Dproprietary_codecs=1 \
-                                 -Duse_cups=0 \
                                  -Duse_xi2_mt=2 \
                                  -Dtoolkit_uses_gtk=0 \
                                  -Dtoolkit_efl=1 \