[M67 Dev][Tizen] Migrate version and profile related changes 03/186403/3
authorChandan Padhi <c.padhi@samsung.com>
Thu, 9 Aug 2018 08:50:18 +0000 (01:50 -0700)
committerChandan Padhi <c.padhi@samsung.com>
Mon, 13 Aug 2018 06:56:34 +0000 (12:26 +0530)
This CL introduces defining the version automatically depending
on build configuration.

The double-quotes of numbers in script are removed to properly
handle a comparison operation.

Also, this removes legacy tizen version conditions such as 2.3
or 2.4 and unused legacy tizen profile dependencies.

There were tizen or chromium version definations in xml or pc file
like below.
>> in chromium-efl_v3.0.xml or ubrowser_v3.0.xml
>> <manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" ...

Whenever tizen version is upgraded, the file chromium-efl_vX.X.xml
or ubrowser_vX.X.xml have been manually added or removed.

Although it works, it is not elegant and other parts of the source
base do not use similar practice.

This introduces automatically defining the current version, depending
on build system configuration and removes unsued configuration files.

This CL also updates chromium version to 67.3396.0.

This CL also refactors xml related things as per platform requirement.

Reference:
https://review.tizen.org/gerrit/#/c/172280/
https://review.tizen.org/gerrit/#/c/173541/
https://review.tizen.org/gerrit/#/c/177898/

Change-Id: Ic41a6664378d941780805e29f8d6f3d3d07a2e8a
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
31 files changed:
packaging/chromium-efl.manifest
packaging/chromium-efl.spec
packaging/chromium-efl_v3.0.manifest [deleted file]
packaging/manifest.xml [deleted file]
tizen_src/build/BUILD.gn
tizen_src/build/ccache_env.sh
tizen_src/build/common.sh
tizen_src/build/config/BUILD.gn
tizen_src/build/config/tizen_features.gni
tizen_src/build/gbs.conf
tizen_src/build/gn_chromiumefl.sh
tizen_src/build/pkgconfig/chromium-efl.pc.in
tizen_src/chromium_impl/build/tizen_version.h
tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc
tizen_src/chromium_impl/content/browser/speech/tts_tizen.cc
tizen_src/chromium_impl/content/browser/speech/tts_tizen.h
tizen_src/chromium_impl/content/common/paths_efl.cc
tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.cc
tizen_src/ewk/efl_integration/common/version_info.cc
tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc [deleted file]
tizen_src/ewk/efl_webview_app/BUILD.gn
tizen_src/ewk/efl_webview_app/chromium-efl.xml [deleted file]
tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml [deleted file]
tizen_src/ewk/efl_webview_app/efl_webview_app.png [new file with mode: 0644]
tizen_src/ewk/efl_webview_app/mini_browser.c
tizen_src/ewk/efl_webview_app/mini_browser.png [moved from tizen_src/ewk/efl_webview_app/mini-browser.png with 100% similarity]
tizen_src/ewk/efl_webview_app/org.tizen.chromium-efl.xml.in [new file with mode: 0644]
tizen_src/ewk/efl_webview_app/ubrowser.xml [deleted file]
tizen_src/ewk/efl_webview_app/ubrowser_v3.0.xml [deleted file]
tizen_src/ewk/tizen_version_defines_for_apps.gni [deleted file]
tizen_src/ewk/ubrowser/ubrowser.xml [deleted file]

index 0e7e03a..2a0cec5 100644 (file)
@@ -1,63 +1,5 @@
 <manifest>
-  <define>
-    <domain name="chromium-efl" policy="shared" />
-    <provide>
-      <label name="chromium-efl::db"/>
-    </provide>
-    <permit>
-      <smack permit="com.samsung.menu-screen" type="rwx" />
-      <smack permit="e17" type="rwx" />
-      <smack permit="system::use_internet" type="w" />
-    </permit>
-    <request>
-      <smack request="ail::db" type="rw" />
-      <smack request="dbus" type="rwx" />
-      <smack request="com.samsung.indicator" type="rw" />
-      <smack request="system::vconf" type="rwxat" />
-      <smack request="system::media" type="rwxat" />
-      <smack request="system::share" type="rwxat" />
-      <smack request="system::use_internet" type="rw" />
-      <smack request="system::homedir" type="rwxat" />
-      <smack request="xorg" type="rwx" />
-      <smack request="isf" type="rwx" />
-      <smack request="net-config" type="rw" />
-      <smack request="device::app_logging" type="w" />
-      <smack request="immvibed" type="rw" />
-      <smack request="aul::launch" type="x" />
-      <smack request="location_fw::client" type="rw" />
-      <smack request="device::video" type="rw" />
-      <smack request="mm_qcamera_daemon" type="w" />
-      <smack request="device::camera" type="rw" />
-      <smack request="pulseaudio" type="rwxat" />
-      <smack request="pulseaudio::record" type="r" />
-      <smack request="sound_server" type="rw" />
-      <smack request="chromium-efl::db" type="rwxat" />
-      <smack request="ui-gadget::client" type="rwx" />
-      <smack request="deviced::haptic" type="rw" />
-
-      <smack request="pkgmgr::db" type="rw" />
-      <smack request="system::vconf_inhouse" type="rwl" />
-      <smack request="system::vconf_system" type="rwl" />
-      <smack request="system::vconf_setting" type="r" />
-      <smack request="system::vconf_misc" type="rl" />
-      <smack request="system::vconf_multimedia" type="rwl" />
-      <smack request="sys-assert::core" type="wx" />
-      <smack request="pkgmgr-server" type="r" />
-      <smack request="efreet" type="rx" />
-      <smack request="_" type="rwx" />
-      <smack request="device::sys_logging" type="w" />
-    </request>
-  </define>
   <request>
     <domain name="_"/>
   </request>
-  <assign>
-    <filesystem path="/usr/lib/chromium-efl/efl_webprocess" label="chromium-efl" exec_label="none"/>
-    <filesystem path="/opt/usr/apps/chromium-efl/data/db/" label="chromium-efl::db" exec_label="none"/>
-    <filesystem path="/usr/lib/libchromium-ewk.so" label="_" />
-    <filesystem path="/opt/share/icons/mini-browser.png" label="_" />
-    <filesystem path="/usr/bin/efl_webview_app" label="chromium-efl" exec_label="chromium-efl"/>
-    <filesystem path="/usr/bin/mini_browser" label="chromium-efl" exec_label="chromium-efl"/>
-    <filesystem path="/usr/bin/ubrowser" label="chromium-efl" exec_label="chromium-efl"/>
-  </assign>
 </manifest>
index 9243e5d..6d17629 100644 (file)
@@ -1,8 +1,8 @@
 Name: chromium-efl
 Summary: Chromium EFL
 # Set by by scripts/update-chromium-version.sh
-%define ChromiumVersion 53.2785.0
-%define Week 36
+%define ChromiumVersion 67.3396.0
+%define Week 1
 Version: %{ChromiumVersion}.%{Week}
 Release: 1
 # The 'Group' should be specified as one of the following valid group list.
@@ -26,34 +26,7 @@ Source1: content_shell.in
 
 %define _smp_mflags -j%(echo $((`/usr/bin/getconf _NPROCESSORS_ONLN` / 2)))
 
-# Conditions for OBS build
-# The OBS build does not support running script 'build_{target}.sh'.
-# TODO: There is a bug regarding mismatched versions from repository.
-#       So, the versions need to be considered as originally intended versions,
-#       until those versions are fixed by platform team.
-#       1) The value '2.3' of '%{tizen}' should be '2.4'.
-#       2) The value '2.0' of '%{tizen}' should be '2.3'.
-%if "%{tizen}" == "3.0"
-%define chromium_efl_tizen_version 3.0
-%endif
-%if "%{tizen}" == "2.3" || "%{tizen}" == "2.4"
-%define chromium_efl_tizen_version 2.4
-%endif
-%if "%{tizen}" == "2.0"
-%define chromium_efl_tizen_version 2.3
-%endif
-
-%if %{!?TIZEN_PROFILE_TV:0}%{?TIZEN_PROFILE_TV:1} || "%{!?profile:0}%{?profile}" == "tv"
-%define chromium_efl_tizen_profile tv
-%else
-%define chromium_efl_tizen_profile mobile
-%endif
-
-# Excluded wearable profile build
-# Chromium-efl doesn't support the wearable profile
-%if "%{?tizen_profile_name}" == "wearable"
-ExcludeArch: %{arm} %ix86 x86_64
-%endif
+%define tizen_version %{tizen_version_major}%{tizen_version_minor}
 
 Requires(post): /sbin/ldconfig
 Requires(post): xkeyboard-config
@@ -98,6 +71,7 @@ BuildRequires: pkgconfig(libffi)
 BuildRequires: pkgconfig(libpng)
 BuildRequires: pkgconfig(libpulse)
 BuildRequires: pkgconfig(libtbm)
+BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: pkgconfig(libxml-2.0)
@@ -115,14 +89,12 @@ BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(zlib)
 
 # Applied python acceleration for generating gyp files.
-%if "%{chromium_efl_tizen_version}" == "3.0"
 %ifarch armv7l
 BuildRequires: python-accel-armv7l-cross-arm
 %endif
 %ifarch aarch64
 BuildRequires: python-accel-aarch64-cross-aarch64
 %endif
-%endif
 
 %if "%{?_with_wayland}" == "1"
 BuildRequires: pkgconfig(ecore-wayland)
@@ -141,13 +113,11 @@ BuildRequires: pkgconfig(xfixes)
 BuildRequires: pkgconfig(xtst)
 %endif
 
-%if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" == "2.4"
-BuildRequires: pkgconfig(glesv2)
-%endif
-
-# Version Conditions for Every Targets
-%if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" >= "3.0"
-BuildRequires: pkgconfig(libtzplatform-config)
+# TODO(youngsoo): The binutils-gold crashes mini_browser on the Tizen v3.0 ARM 64 bit images.
+#                 Once fixed, use binutils-gold for all targets on Tizen v3.0.
+%ifnarch aarch64 %{arm} # [M48_2564] Temporary excluding arm architecture for fixing memory issue
+                        #            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15383
+BuildRequires: binutils-gold
 %endif
 
 %description
@@ -188,13 +158,9 @@ Chromium EFL unit test utilities
 %endif
 
 # The macros '%TZ_' are valid from tizen v3.0
-%if "%{chromium_efl_tizen_version}" >= "3.0"
-%define _manifestdir %TZ_SYS_RW_PACKAGES
-%define _desktop_icondir %TZ_SYS_RW_ICONS/default/small
-%else
-%define _manifestdir /usr/share/packages
-%define _desktop_icondir /usr/share/icons/default/small
-%endif
+%define _pkgid org.tizen.%{name}
+%define _icondir %TZ_SYS_RO_APP/%{_pkgid}/shared/res
+%define _xmldir %TZ_SYS_RO_PACKAGES
 
 # Directory for internal chromium executable components
 %global CHROMIUM_EXE_DIR %{_libdir}/%{name}
@@ -204,11 +170,7 @@ Chromium EFL unit test utilities
 %global CHROMIUM_UNITTESTS_DIR /opt/usr/chromium-unittests/
 # Directory containing localization files
 %global CHROMIUM_LOCALE_DIR %{_datadir}/%{name}/locale
-%if "%{chromium_efl_tizen_version}" >= "3.0"
 %global CHROMIUM_WEBDB_DIR %TZ_SYS_RW_APP/org.tizen.%{name}
-%else
-%global CHROMIUM_WEBDB_DIR /opt/usr/apps/%{name}
-%endif
 
 %prep
 %setup -q
@@ -237,12 +199,6 @@ Chromium EFL unit test utilities
   CXXFLAGS="$(echo $CXXFLAGS | sed -E 's/-g[0-9] /-g0 /g')"
 %endif
 
-%if "%{!?chromium_efl_tizen_profile:0}%{?chromium_efl_tizen_profile}" == "mobile"
-  %define OUTPUT_BUILD_PROFILE_TARGET mobile
-%else
-  %define OUTPUT_BUILD_PROFILE_TARGET tv
-%endif
-
 %ifarch armv7l
 %define ARCHITECTURE armv7l
 %endif
@@ -271,23 +227,24 @@ export GN_GENERATOR_OUTPUT=$PWD/%{OUTPUT_BASE_FOLDER}
 %global OUTPUT_FOLDER %{OUTPUT_BASE_FOLDER}
 
 if type ccache &> /dev/null; then
-  source tizen_src/build/ccache_env.sh %{OUTPUT_BUILD_PROFILE_TARGET}
+  source tizen_src/build/ccache_env.sh tizen
 fi
 
 %if 0%{!?_skip_gn:1}
 #gn generate
 #run standard gn_chromiumefl wrapper
 ./tizen_src/build/gn_chromiumefl.sh \
+  "is_tizen=true" \
   "data_dir=\"%{CHROMIUM_DATA_DIR}\"" \
   "edje_dir=\"%{CHROMIUM_DATA_DIR}/themes\"" \
   "exe_dir=\"%{CHROMIUM_EXE_DIR}\"" \
-  "locale_dir=\"%{CHROMIUM_LOCALE_DIR}\"" \
+  "tizen_version=%{tizen_version}" \
+  "tizen_version_major=%{tizen_version_major}" \
+  "tizen_version_minor=%{tizen_version_minor}" \
+  "tizen_version_patch=%{tizen_version_patch}" \
 %if 0%{?_remove_webcore_debug_symbols:1}
   "remove_webcore_debug_symbols=true" \
 %endif
-%if 0%{?chromium_efl_tizen_version:1}
-  "chromium_efl_tizen_version=%{gn_chromium_efl_tizen_version}" \
-%endif
 %if "%{?_with_wayland}" == "1"
   "use_wayland=true" \
 %endif
@@ -297,10 +254,9 @@ fi
 %if 0%{?component_build}
  "component=\"shared_library\"" \
 %endif
-  "is_tizen=true"
 %endif  # _skip_gn
 
-ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
+ninja %{_smp_mflags} -C "%{OUTPUT_FOLDER}" \
 %if 0%{?_enable_content_shell}
   content_shell \
 %endif
@@ -332,22 +288,17 @@ cp third_party/icu/android/icudtl.dat "%{OUTPUT_FOLDER}"
 # gbs build script runs rpmlint to test created packages. There is some BUG in
 # this script and directory /home/abuild/rpmbuild/OTHER/ isn't created. This
 # directory is required for rpmlint's log file and its lack causes build error.
-%if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" == "3.0"
 if [ ! -d %{buildroot}/../../OTHER/ -a -f /opt/testing/bin/rpmlint ]; then
    mkdir -p %{buildroot}/../../OTHER/
 fi
-%endif
 
 %install
 
 # Generate pkg-confg file
 mkdir -p "%{OUTPUT_FOLDER}"/pkgconfig/
-sed -e 's#?VERSION?#%{version}#' tizen_src/build/pkgconfig/chromium-efl.pc.in \
+sed -e 's#@CHROMIUM_VERSION@#%{version}#' tizen_src/build/pkgconfig/chromium-efl.pc.in \
     > "%{OUTPUT_FOLDER}"/pkgconfig/chromium-efl.pc
 
-%if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" != "3.0"
-install -d "%{buildroot}"%{_sysconfdir}/smack/accesses2.d
-%endif
 install -d "%{buildroot}"%{_bindir}
 install -d "%{buildroot}"%{_libdir}/pkgconfig
 install -d "%{buildroot}"%{_includedir}/chromium-ewk
@@ -366,32 +317,25 @@ install -m 0755 "%{OUTPUT_FOLDER}"/snapshot_blob.bin "%{buildroot}%{CHROMIUM_EXE
 install -m 0755 "%{OUTPUT_FOLDER}"/content_shell.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
 install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj   "%{buildroot}%{CHROMIUM_DATA_DIR}"/themes
 
-# for Tizen v3.0
-%if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" == "3.0"
 mkdir -p "%{buildroot}"/usr/apps/org.tizen.%{name}/bin
 install -m 0755 "%{OUTPUT_FOLDER}"/efl_webview_app   "%{buildroot}"/usr/apps/org.tizen.%{name}/bin/
 install -m 0755 "%{OUTPUT_FOLDER}"/mini_browser      "%{buildroot}"/usr/apps/org.tizen.%{name}/bin/
 install -m 0755 "%{OUTPUT_FOLDER}"/ubrowser          "%{buildroot}"/usr/apps/org.tizen.%{name}/bin/
 
-install -d "%{buildroot}"/usr/share/packages
-install -m 0644 tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml "%{buildroot}"/usr/share/packages
-install -m 0644 tizen_src/ewk/efl_webview_app/ubrowser_v3.0.xml "%{buildroot}"/usr/share/packages
-
-mkdir -p "%{buildroot}"/usr/apps/org.tizen.%{name}/res/icons
-install -d "%{buildroot}"/usr/share/icons
-install -m 0644 tizen_src/ewk/efl_webview_app/mini-browser.png "%{buildroot}"/usr/apps/org.tizen.%{name}/res/icons
-%else # for Tizen v2.X
-install -m 0755 "%{OUTPUT_FOLDER}"/efl_webview_app   "%{buildroot}"%{_bindir}
-install -m 0755 "%{OUTPUT_FOLDER}"/mini_browser      "%{buildroot}"%{_bindir}
-install -m 0755 "%{OUTPUT_FOLDER}"/ubrowser          "%{buildroot}"%{_bindir}
-
-install -d "%{buildroot}"/opt/share/packages
-install -m 0644 tizen_src/ewk/efl_webview_app/chromium-efl.xml "%{buildroot}"/opt/share/packages
-install -m 0644 tizen_src/ewk/efl_webview_app/ubrowser.xml     "%{buildroot}"/opt/share/packages
-
-install -d "%{buildroot}"/opt/share/icons
-install -m 0644 tizen_src/ewk/efl_webview_app/mini-browser.png "%{buildroot}"/opt/share/icons
-%endif
+install -d "%{OUTPUT_FOLDER}"/packages
+install -d %{buildroot}%{_xmldir}
+sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
+    -e 's#@CHROMIUM_VERSION@#%{version}#g' \
+    -e 's#@TZ_SYS_RO_APP@#%{TZ_SYS_RO_APP}#g' \
+    -e 's#@ICON_DIR@#%{_icondir}#g' \
+    tizen_src/ewk/efl_webview_app/%{_pkgid}.xml.in \
+    > %{OUTPUT_FOLDER}/packages/%{_pkgid}.xml
+install -m 0644 %{OUTPUT_FOLDER}/packages/%{_pkgid}.xml           %{buildroot}%{_xmldir}
+
+install -d %{buildroot}%{_icondir}
+install -m 0644 tizen_src/ewk/ubrowser/ubrowser.png               %{buildroot}%{_icondir}
+install -m 0644 tizen_src/ewk/efl_webview_app/mini_browser.png    %{buildroot}%{_icondir}
+install -m 0644 tizen_src/ewk/efl_webview_app/efl_webview_app.png %{buildroot}%{_icondir}
 
 install -m 0644 "%{OUTPUT_FOLDER}"/pkgconfig/*.pc    "%{buildroot}"%{_libdir}/pkgconfig/
 install -m 0644 tizen_src/ewk/efl_integration/public/*.h                  "%{buildroot}"%{_includedir}/chromium-ewk/
@@ -429,35 +373,18 @@ smack_reload.sh
 # File System and so on.
 
 mkdir -p %{CHROMIUM_WEBDB_DIR}/data/
-# The path is for multi-user by default on tizen v3.0.
-%if "%{chromium_efl_tizen_version}" == "2.4"
-chown -R app:app %{CHROMIUM_WEBDB_DIR}/data
-%endif
-
-mkdir -p %{_desktop_icondir}
-mkdir -p %{_manifestdir}
 
 %postun
 
 %files
-# for Tizen v3.0
-%if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" == "3.0"
-%manifest packaging/chromium-efl_v3.0.manifest
+%manifest packaging/chromium-efl.manifest
 /usr/apps/org.tizen.%{name}/bin/efl_webview_app
 /usr/apps/org.tizen.%{name}/bin/mini_browser
 /usr/apps/org.tizen.%{name}/bin/ubrowser
-/usr/share/packages/chromium-efl_v3.0.xml
-/usr/share/packages/ubrowser_v3.0.xml
-/usr/apps/org.tizen.%{name}/res/icons/mini-browser.png
-%else # for Tizen v2.X
-%manifest packaging/%{name}.manifest
-%{_bindir}/efl_webview_app
-%{_bindir}/mini_browser
-%{_bindir}/ubrowser
-/opt/share/packages/chromium-efl.xml
-/opt/share/packages/ubrowser.xml
-/opt/share/icons/mini-browser.png
-%endif
+%{_icondir}/efl_webview_app.png
+%{_icondir}/mini_browser.png
+%{_icondir}/ubrowser.png
+%{_xmldir}/%{_pkgid}.xml
 %defattr(-,root,root,-)
 %{_libdir}/libchromium-ewk.so
 %{CHROMIUM_EXE_DIR}/efl_webprocess
diff --git a/packaging/chromium-efl_v3.0.manifest b/packaging/chromium-efl_v3.0.manifest
deleted file mode 100644 (file)
index 2a0cec5..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-  <request>
-    <domain name="_"/>
-  </request>
-</manifest>
diff --git a/packaging/manifest.xml b/packaging/manifest.xml
deleted file mode 100644 (file)
index 8d2db07..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
-    <Id>kmcele1k1p</Id>
-    <Version>53.2785.0.36</Version>
-    <Type>C++App</Type>
-    <Descriptions>
-        <Description Locale="eng-PH"/>
-        <Description Locale="zho-SG"/>
-        <Description Locale="kat-GE"/>
-        <Description Locale="est-EE"/>
-        <Description Locale="ukr-UA"/>
-        <Description Locale="srp-RS"/>
-        <Description Locale="hrv-HR"/>
-        <Description Locale="isl-IS"/>
-        <Description Locale="ell-GR"/>
-        <Description Locale="glg-ES"/>
-        <Description Locale="lit-LT"/>
-        <Description Locale="aze-AZ"/>
-        <Description Locale="eng-US"/>
-        <Description Locale="mkd-MK"/>
-        <Description Locale="zho-HK"/>
-        <Description Locale="hye-AM"/>
-        <Description Locale="hun-HU"/>
-        <Description Locale="slk-SK"/>
-        <Description Locale="ces-CZ"/>
-        <Description Locale="fin-FI"/>
-        <Description Locale="ara-AE"/>
-        <Description Locale="ita-IT"/>
-        <Description Locale="eus-ES"/>
-        <Description Locale="tur-TR"/>
-        <Description Locale="rus-RU"/>
-        <Description Locale="cat-ES"/>
-        <Description Locale="kaz-KZ"/>
-        <Description Locale="deu-DE"/>
-        <Description Locale="zho-CN"/>
-        <Description Locale="por-PT"/>
-        <Description Locale="slv-SI"/>
-        <Description Locale="fra-FR"/>
-        <Description Locale="ron-RO"/>
-        <Description Locale="hin-IN"/>
-        <Description Locale="fra-CA"/>
-        <Description Locale="spa-ES"/>
-        <Description Locale="nld-NL"/>
-        <Description Locale="dan-DK"/>
-        <Description Locale="por-BR"/>
-        <Description Locale="bul-BG"/>
-        <Description Locale="zho-TW"/>
-        <Description Locale="jpn-JP"/>
-        <Description Locale="swe-SE"/>
-        <Description Locale="kor-KR"/>
-        <Description Locale="spa-MX"/>
-        <Description Locale="nob-NO"/>
-        <Description Locale="uzb-UZ"/>
-        <Description Locale="pol-PL"/>
-        <Description Locale="gle-IE"/>
-        <Description Locale="eng-GB"/>
-        <Description Locale="lav-LV"/>
-    </Descriptions>
-    <Url/>
-    <Requirements>
-        <Feature Name="http://tizen.org/feature/platform.core.cpu.arch">x86</Feature>
-        <Feature Name="http://tizen.org/feature/platform.core.fpu.arch">vfpv3</Feature>
-    </Requirements>
-    <Apps>
-        <ApiVersion>2.0</ApiVersion>
-        <Privileges>
-            <Privilege>http://tizen.org/privilege/web.privacy</Privilege>
-            <Privilege>http://tizen.org/privilege/web.service</Privilege>
-            <Privilege>http://tizen.org/privilege/alarm</Privilege>
-            <Privilege>http://tizen.org/privilege/application.launch</Privilege>
-            <Privilege>http://tizen.org/privilege/power</Privilege>
-            <Privilege>http://tizen.org/privilege/appmanager.launch</Privilege>
-            <Privilege>http://tizen.org/privilege/content.write</Privilege>
-        </Privileges>
-        <UiApp HwAcceleration="On" Main="True" MenuIconVisible="True" Name="content_shell">
-            <UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>
-            <UiTheme SystemTheme="White"/>
-            <DisplayNames>
-                <DisplayName Locale="eng-PH">Internet</DisplayName>
-                <DisplayName Locale="zho-SG">网络</DisplayName>
-                <DisplayName Locale="kat-GE">ინტერნეტი</DisplayName>
-                <DisplayName Locale="est-EE">Internet</DisplayName>
-                <DisplayName Locale="ukr-UA">Браузер</DisplayName>
-                <DisplayName Locale="srp-RS">Internet</DisplayName>
-                <DisplayName Locale="hrv-HR">Internet</DisplayName>
-                <DisplayName Locale="isl-IS">Internetið</DisplayName>
-                <DisplayName Locale="ell-GR">Internet</DisplayName>
-                <DisplayName Locale="glg-ES">Internet</DisplayName>
-                <DisplayName Locale="lit-LT">Internetas</DisplayName>
-                <DisplayName Locale="aze-AZ">Internet</DisplayName>
-                <DisplayName Locale="eng-US">Internet</DisplayName>
-                <DisplayName Locale="mkd-MK">Интернет</DisplayName>
-                <DisplayName Locale="zho-HK">瀏覽器</DisplayName>
-                <DisplayName Locale="slk-SK">Internet</DisplayName>
-                <DisplayName Locale="hun-HU">Internet</DisplayName>
-                <DisplayName Locale="hye-AM">Ինտերնետ</DisplayName>
-                <DisplayName Locale="ces-CZ">Internet</DisplayName>
-                <DisplayName Locale="fin-FI">Internet</DisplayName>
-                <DisplayName Locale="ara-AE">الإنترنت</DisplayName>
-                <DisplayName Locale="eus-ES">Internet</DisplayName>
-                <DisplayName Locale="ita-IT">Internet</DisplayName>
-                <DisplayName Locale="tur-TR">İnternet</DisplayName>
-                <DisplayName Locale="rus-RU">Интернет</DisplayName>
-                <DisplayName Locale="cat-ES">Internet</DisplayName>
-                <DisplayName Locale="kaz-KZ">Шолушы</DisplayName>
-                <DisplayName Locale="deu-DE">Internet</DisplayName>
-                <DisplayName Locale="zho-CN">互联网</DisplayName>
-                <DisplayName Locale="por-PT">Internet</DisplayName>
-                <DisplayName Locale="slv-SI">Internet</DisplayName>
-                <DisplayName Locale="fra-FR">Internet</DisplayName>
-                <DisplayName Locale="ron-RO">Internet</DisplayName>
-                <DisplayName Locale="hin-IN">इंटरनेट</DisplayName>
-                <DisplayName Locale="fra-CA">Internet</DisplayName>
-                <DisplayName Locale="spa-ES">Internet</DisplayName>
-                <DisplayName Locale="nld-NL">Internet</DisplayName>
-                <DisplayName Locale="dan-DK">Internet</DisplayName>
-                <DisplayName Locale="por-BR">Internet</DisplayName>
-                <DisplayName Locale="bul-BG">Интернет</DisplayName>
-                <DisplayName Locale="zho-TW">網際網路</DisplayName>
-                <DisplayName Locale="jpn-JP">インターネット</DisplayName>
-                <DisplayName Locale="swe-SE">Internet</DisplayName>
-                <DisplayName Locale="kor-KR">인터넷</DisplayName>
-                <DisplayName Locale="spa-MX">Internet</DisplayName>
-                <DisplayName Locale="nob-NO">Internett</DisplayName>
-                <DisplayName Locale="uzb-UZ">Internet</DisplayName>
-                <DisplayName Locale="pol-PL">Internet</DisplayName>
-                <DisplayName Locale="gle-IE">an tIdirlíon</DisplayName>
-                <DisplayName Locale="lav-LV">Internets</DisplayName>
-                <DisplayName Locale="eng-GB">Internet</DisplayName>
-            </DisplayNames>
-            <Icons>
-                <Icon Section="MainMenu" Type="Xhigh">mini-browser.png</Icon>
-            </Icons>
-            <AppControls>
-                <AppControl>
-                    <Operation>http://tizen.org/appcontrol/operation/view</Operation>
-                    <Uri>file</Uri>
-                    <Uri>http</Uri>
-                    <Uri>https</Uri>
-                    <Uri>javascript</Uri>
-                </AppControl>
-                <AppControl>
-                    <MimeType>application/xml</MimeType>
-                    <MimeType>image/svg+xml</MimeType>
-                    <MimeType>text/html</MimeType>
-                    <Operation>http://tizen.org/appcontrol/operation/view</Operation>
-                </AppControl>
-            </AppControls>
-            <LaunchConditions/>
-            <Notifications>
-                <Notification Name="Ticker">On</Notification>
-                <Notification Name="Sound">On</Notification>
-                <Notification Name="Contents">Off</Notification>
-                <Notification Name="Badge">On</Notification>
-            </Notifications>
-        </UiApp>
-    </Apps>
-</Manifest>
index d120334..b6be37b 100644 (file)
@@ -184,7 +184,7 @@ tizen_pkg_config("libcapi-appfw-application") {
 
 config("capi-appfw-application-public") {
   if (is_tizen) {
-    #    cflags = [ "-capi-appfw-application" ]
+    #   cflags = [ "-capi-appfw-application" ]
   }
 }
 
@@ -360,7 +360,7 @@ config("x11-public") {
 }
 
 config("gstreamer") {
-  if (chromium_efl_tizen_version >= 24) {
+  if (is_tizen) {
     ldflags = [
       "-lgstreamer-1.0",
       "-lgstbase-1.0",
@@ -368,20 +368,12 @@ config("gstreamer") {
       "-lgstpbutils-1.0",
       "-lgstvideo-1.0",
     ]
-  } else {  # for Tizen v2.X
-    ldflags = [
-      "gstreamer-0.10",
-      "gstreamer-base-0.10",
-      "gstreamer-app-0.10",
-      "gstreamer-pbutils-0.10",
-      "gstreamer-interfaces-0.10",
-      "gstreamer-video-0.10",
-    ]
   }
 }
 
 tizen_pkg_config("libgstreamer") {
-  if (chromium_efl_tizen_version >= 24) {
+  packages = []
+  if (is_tizen) {
     packages = [
       "gstreamer-1.0",
       "gstreamer-base-1.0",
@@ -389,15 +381,6 @@ tizen_pkg_config("libgstreamer") {
       "gstreamer-pbutils-1.0",
       "gstreamer-video-1.0",
     ]
-  } else {  # for Tizen v2.X
-    packages = [
-      "gstreamer-0.10",
-      "gstreamer-base-0.10",
-      "gstreamer-app-0.10",
-      "gstreamer-pbutils-0.10",
-      "gstreamer-interfaces-0.10",
-      "gstreamer-video-0.10",
-    ]
   }
 }
 
@@ -573,15 +556,13 @@ config("tizen_tzplatform_config") {
   ldflags = [ "-ltzplatform-config-2.0" ]
 }
 
-tizen_pkg_config("libtizen_tzplatform_config") {
-  packages = []
-  if (chromium_efl_tizen_version >= 30) {
-    #packages = [ "libtzplatform-config" ]
+if (is_tizen) {
+  tizen_pkg_config("libtizen_tzplatform_config") {
+    packages = []
+    packages = [ "libtzplatform-config" ]
   }
 }
 
 config("tizen_tzplatform_config-public") {
-  if (chromium_efl_tizen_version >= 30) {
-    cflags = [ "-libtzplatform-config" ]
-  }
+  cflags = [ "-libtzplatform-config" ]
 }
index 5af59bb..18bdaac 100644 (file)
@@ -12,7 +12,7 @@ if ! type ccache &> /dev/null; then
   return 0
 fi
 
-if [ "$1" == "desktop" -o  "$1" == "mobile" -o "$1" == "tv" -o "$1" == "crosscompile" ]; then
+if [ "$1" == "tizen" -o  "$1" == "desktop" -o "$1" == "crosscompile" ]; then
   OUTPUT_BASE_FOLDER=out.${1}.$(getHostArch)
   export CCACHE_CPP2=yes
   export CCACHE_SLOPPINESS=time_macros
index 843bf0d..11607b1 100755 (executable)
@@ -133,8 +133,6 @@ function hostGnChromiumEfl() {
     ${TOPDIR}/tizen_src/build/gn_chromiumefl.sh \
       $XWALK_ARG \
       $COMPONENT_ARG \
-      "outdir=\"$TOPDIR/out.$(getHostArch)\"" \
-      "chromium_efl_tizen_version=30" \
       $@
   fi
 }
@@ -307,16 +305,11 @@ function setupAndExecuteTargetBuild() {
     CONF_FLAG="--conf ${SCRIPTDIR}/gbs.conf"
   fi
 
-  EXTRA_PACK_OPTS=""
-  if [ "$PROFILE" == "tztv_v2.4_product" ]; then
-    EXTRA_PACK_OPTS="--extra-packs python-base-x86-arm,python-x86-arm,python-xml-x86-arm"
-  fi
-
   if [ "$(echo "${PROFILE}" | grep -P "kant|jazz|hawk|product")" == "" -a "$NOINIT" == 0 ]; then
     processRpmlintOption $PROFILE $RPMLINT
   fi
 
-  gbs $CONF_FLAG build -P $PROFILE --include-all -A $ARCHITECTURE "${ARGS[@]}" $BUILD_CONF_OPTS $EXTRA_PACK_OPTS --incremental
+  gbs $CONF_FLAG build -P $PROFILE --include-all -A $ARCHITECTURE "${ARGS[@]}" $BUILD_CONF_OPTS --incremental
 }
 
 function processRpmlintOption() {
index 6ec9082..a46ac68 100644 (file)
@@ -43,30 +43,13 @@ config("tizen_feature_flags") {
     defines += [
       "OS_TIZEN",
       "WTF_OS_TIZEN",
+      "TIZEN_VERSION_MAJOR=${tizen_version_major}",
+      "TIZEN_VERSION_MINOR=${tizen_version_minor}",
+      "TIZEN_VERSION_PATCH=${tizen_version_patch}",
     ]
 
     defines += [ "NO_UNWIND_TABLES" ]
 
-    if (chromium_efl_tizen_version == 30) {
-      defines += [
-        "TIZEN_MAJOR_VERSION=3",
-        "TIZEN_MINOR_VERSION=0",
-        "TIZEN_PATCH_VERSION=0",
-      ]
-    } else if (chromium_efl_tizen_version == 24) {
-      defines += [
-        "TIZEN_MAJOR_VERSION=2",
-        "TIZEN_MINOR_VERSION=4",
-        "TIZEN_PATCH_VERSION=0",
-      ]
-    } else if (chromium_efl_tizen_version == 23) {
-      defines += [
-        "TIZEN_MAJOR_VERSION=2",
-        "TIZEN_MINOR_VERSION=3",
-        "TIZEN_PATCH_VERSION=0",
-      ]
-    }
-
     if (use_wayland) {
       defines += [ "USE_WAYLAND" ]
     }
index 03c4f09..bf77329 100644 (file)
@@ -34,7 +34,10 @@ declare_args() {
   tizen_data_dir = "/usr/share/chromium-efl/"
   locale_dir = "/usr/share/chromium-efl/locale/"
 
-  chromium_efl_tizen_version = 24
+  tizen_version = 0
+  tizen_version_major = 0
+  tizen_version_minor = 0
+  tizen_version_patch = 0
   tizen_tbm_support = false
 }
 
index d0e9573..ca18bcd 100755 (executable)
@@ -978,106 +978,3 @@ url=http://168.219.244.109/tizen-rsa/tizen-3.0-base-toolchain/standard/latest/re
 
 [repo.tv_product_3.0_kantm]
 url=http://168.219.244.109/releases/tizen-3.0-product-main2017/product/KantM/latest/repos/product/armv7l/packages/
-
-###############################################
-#
-# Tizen v2.4 for mobile
-#
-[profile.tizenmb_v2.4]
-obs = obs.tizenmb
-# The order is IMPORTANT!
-repos = repo.tizenmb_supplement_v2.4, repo.devel_gcc49_base_standard, repo.spin_2.4_mobile_target_tm1
-buildroot = ~/GBS-ROOT-2.4-DEV
-
-[repo.spin_2.4_mobile_target_tm1]
-url = http://168.219.209.55/download/snapshots/2.4-mobile/common/latest/repos/target-TM1/packages/
-
-[repo.devel_gcc49_base_standard]
-url = http://168.219.209.55/download/snapshots/2.4-base/common/latest/repos/standard/packages/
-
-[repo.tizenmb_supplement_v2.4]
-url = http://10.251.52.177/tizenrepo/eur-open/supplement_mobile_v2.4/
-
-###############################################
-#
-# Tizen v2.4 for emulator(i586)
-#
-[profile.tizen_emulator_v2.4]
-obs = obs.tizenmb
-# The order is IMPORTANT!
-repos = repo.spin_2.4_mobile_emulator, repo.devel_gcc49_base_emulator
-buildroot = ~/GBS-ROOT-2.4-DEV
-
-[repo.spin_2.4_mobile_emulator]
-url = http://168.219.209.55/download/snapshots/2.4-mobile/common/latest/repos/emulator/packages/
-
-[repo.devel_gcc49_base_emulator]
-url = http://168.219.209.55/download/live/devel:/gcc49:/Base/emulator/
-
-###############################################
-#
-# Tizen v2.3 for mobile
-#
-[profile.tizenmb_v2.3]
-obs = obs.tizenmb
-# The order is IMPORTANT!
-repos = repo.tizenmb_supplement_v2.3, repo.tizenmb_supplement_chromium_v2.3, repo.tizenmb_base_v2.3
-buildroot = ~/GBS-ROOT-2.3-DEV
-
-[repo.tizenmb_supplement_v2.3]
-url = http://10.251.52.177/tizenrepo/eur-open/supplement_v2.3
-
-[repo.tizenmb_base_v2.3]
-url = http://10.251.52.177/tizenrepo/eur-open/PtnZ910FXX_20141020.002
-
-# Supplementary repo for chromium
-[repo.tizenmb_supplement_chromium_v2.3]
-url = http://10.251.52.177/tizenrepo/eur-open/supplement_mobile_chromium_orange_v2.3_1
-
-###############################################
-#
-# Tizen v2.1 for mobile
-#
-[profile.tizenmb_v2.1]
-passwdx =
-obs = obs.tizenmb
-# The order is IMPORTANT!
-repos = repo.tizenmb_supplement, repo.tizenmb_base
-buildroot = ~/GBS-ROOT
-
-[obs.tizenmb]
-url = http://slp-build.sec.samsung.net:81
-
-# base repo
-[repo.tizenmb_base]
-url = http://10.251.52.177/tizenrepo/jpn-dcm/Redwood8974JPNDCM_20131218.006
-
-# Supplementary repo for additional rpms packages required in gbs build
-[repo.tizenmb_supplement]
-url = http://10.251.52.177/tizenrepo/jpn-dcm/supplement
-
-#############################################
-#
-# Tizen v2.4 for product tv (HawkP armv7l)
-#
-[profile.tztv_v2.4_product]
-obs = obs.tztv_v2.4_product
-repos = repo.supplement, repo.product_2016, repo.base_2016
-buildroot = ~/GBS-ROOT-2.4-TV-PRODUCT-ARM-X11
-
-[repo.base_2016]
-url=http://168.219.244.109/tizen-rsa/tztv-2.4-base-main2016/standard/latest/repos/base/armv7l/packages/
-
-[repo.product_2016]
-# TODO: The latest tizen_v2.4 product repository is unstable.
-#       It is better to stay at tztv-2.4-main2016-hawk-p_20150905.1 version until the latest will be stable.
-#url=http://168.219.244.109/releases/tztv-2.4-product-main2016/product/Hawk-P/latest/repos/product/armv7l/packages/
-url=http://168.219.244.109/releases/tztv-2.4-product-main2016/product/Hawk-P/tztv-2.4-main2016-hawk-p_20150905.1/repos/product/armv7l/packages/
-
-[repo.supplement]
-url=http://10.251.52.177/tizenrepo/tv_repo/supplement_tizen_v2.4_product/
-
-[obs.tztv_v2.4_product]
-url = https://168.219.241.169:81
-user = obs_viewer
-passwdx = obs_viewer_169
index 7aedd4e..5aab39b 100755 (executable)
@@ -21,7 +21,7 @@ fi
 EXTRA_GN_ARGS="$@"
 
 # __GN_CHROMIUMEFL_TARGET is defined when we are called from build_desktop.sh.
-# Otherwise we are called by gbs whch already passes the correct building_for_* flag.
+# Otherwise we are called by gbs which already passes the is_tizen flag.
 if [ "$__GN_CHROMIUMEFL_TARGET" == "desktop" ]; then
   target=desktop
 fi
@@ -32,8 +32,8 @@ while [[ $# > 0 ]]; do
       buildType="gbs"
       target="tizen"
       ;;
-    chromium_efl_tizen_version=*)
-      tizen_version=$(echo $1 | sed -e 's#chromium_efl_tizen_version\=\([0-9.]*\)#\1#')
+    tizen_version=*)
+      tizen_version=$(echo $1 | sed -e 's#tizen_version\=\([0-9.]*\)#\1#')
       ;;
     tizen_emulator_support=1)
       tizen_emulator_support=1
@@ -136,20 +136,11 @@ add_tizen_flags() {
                               "
   fi
 
-  if [ "$tizen_version" == "30" ]; then
-    # [M49_2623] Temporary disabling the flag.
-    #            FIXME: http://165.213.149.170/jira/browse/TWF-610
-    ADDITIONAL_GN_PARAMETERS+="tizen_multimedia_support=false
-                               tizen_tbm_support=false
-                              "
-  else
-    ADDITIONAL_GN_PARAMETERS+="tizen_multimedia_support=false
-                               werror=false
-                              "
-  fi
-
-  # use_wayland come from spec file and based on that wayland_bringup sets in tizen_features.gni
-  #add_wayland_flags
+  # [M49_2623] Temporary disabling the flag.
+  #            FIXME: http://165.213.149.170/jira/browse/TWF-610
+  ADDITIONAL_GN_PARAMETERS+="tizen_multimedia_support=false
+                             tizen_tbm_support=false
+                            "
 }
 
 add_wayland_flags() {
@@ -216,15 +207,13 @@ if [ "$target" == "desktop" ]; then
   add_desktop_flags
 else
   add_tizen_flags
-  if [ "$target" == "tizen" ]; then
-    if [ "$target_arch" == "arm" ]; then
-      add_arm_flags
-    fi
-    if [ "$buildType" == "gbs" ]; then
-      add_gbs_flags
-    elif [ "$buildType" == "crosscompile" ]; then
-      add_cross_flags
-    fi
+  if [ "$host_arch" == "arm" -o "$host_arch" == "arm64" ]; then
+    add_arm_flags
+  fi
+  if [ "$buildType" == "gbs" ]; then
+    add_gbs_flags
+  elif [ "$buildType" == "crosscompile" ]; then
+    add_cross_flags
   fi
 fi
 
@@ -243,7 +232,7 @@ _GN_ARGS="
     $COMMON_GN_PARAMETERS
     $ADDITIONAL_GN_PARAMETERS
     $EXTRA_GN_ARGS
-"
+    "
 printf "GN_ARGUMENTS:\n"
 for arg in $_GN_ARGS; do
   printf "    * ${arg##-D}\n"
index 1b9e0bc..db5801d 100644 (file)
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: chromium-efl
 Description: Chromium EFL port
-Version: ?VERSION?
+Version: @CHROMIUM_VERSION@
 
 Libs: -L${libdir} -Wl,-rpath-link=${libdir} -lchromium-ewk
 Cflags: -I${includedir}/chromium-ewk -I${includedir}/v8
index b7db457..6cfdb2a 100644 (file)
@@ -7,7 +7,9 @@
 
 #if defined(OS_TIZEN)
 
-#define TIZEN_VERSION (TIZEN_MAJOR_VERSION * 10000 + TIZEN_MINOR_VERSION * 100 + TIZEN_PATCH_VERSION)
+#define TIZEN_VERSION                                        \
+  (TIZEN_VERSION_MAJOR * 10000 + TIZEN_VERSION_MINOR * 100 + \
+   TIZEN_VERSION_PATCH)
 #define TIZEN_VERSION_EQ(major, minor, patch) \
   (TIZEN_VERSION == (major * 10000 + minor * 100 + patch))
 #define TIZEN_VERSION_AT_LEAST(major, minor, patch) \
index 3d0ba02..f0db783 100644 (file)
@@ -271,16 +271,12 @@ void IMContextEfl::UpdateInputMethodState(ui::TextInputType type,
   bool show = type != ui::TEXT_INPUT_TYPE_NONE;
   if (show && !IsIMFVisible(context_) && show_if_needed) {
     ShowPanel();
-// TODO(youngsoo): workaround on tizen v3.0 platform issue
-// Even if virtual keyboard is shown,
-// the API 'ecore_imf_context_input_panel_state_get()'
-// returns '1' which means the keyboard is not shown.
-// It makes the 'HidePanel()' unreachable.
-#if TIZEN_VERSION_EQ(3, 0, 0)
+    // TODO(youngsoo): workaround on tizen v3.0 platform issue
+    // Even if virtual keyboard is shown,
+    // the API 'ecore_imf_context_input_panel_state_get()'
+    // returns '1' which means the keyboard is not shown.
+    // It makes the 'HidePanel()' unreachable.
   } else if (!show) {
-#else
-  } else if (!show && IsIMFVisible(context_)) {
-#endif
     HidePanel();
   }
 }
index 1b5042b..cbd0a65 100644 (file)
@@ -111,11 +111,7 @@ bool TtsSupportedVoiceCallback(tts_h tts_handle,
                                 const char* language,
                                 int voice_type, void* user_data) {
   TtsTizen* _this = static_cast<TtsTizen*>(user_data);
-#if !TIZEN_VERSION_EQ(2,3,0)
   int currentVoiceType = voice_type;
-#else
-  tts_voice_type_e currentVoiceType = static_cast<tts_voice_type_e>(voice_type);
-#endif
   _this->AddVoice(std::string(language), currentVoiceType);
   return true;
 }
@@ -226,11 +222,7 @@ void TtsTizen::SetTtsDefaultVoice() {
     DCHECK(language);
     default_language_ = language;
     free(language);
-#if !TIZEN_VERSION_EQ(2,3,0)
     default_voice_ = voice_type;
-#else
-    default_voice_ = static_cast<tts_voice_type_e>(voice_type);
-#endif
   }
 }
 
index 2cccc93..2c1cbc3 100644 (file)
@@ -7,9 +7,7 @@
 
 #include "build/tizen_version.h"
 
-#if !TIZEN_VERSION_EQ(2,3,0)
 typedef int tts_voice_type_e;
-#endif
 
 #include "content/browser/speech/tts_message_filter_efl.h"
 #include "content/common/tts_utterance_request_efl.h"
index 0ac6cbe..6fe0acd 100644 (file)
 
 #if defined(OS_TIZEN)
 #include <appfw/app.h>
-#if TIZEN_VERSION_AT_LEAST(3,0,0)
 #include <tzplatform_config.h>
 #endif
-#endif
 
 namespace {
 #if defined(OS_TIZEN)
@@ -38,7 +36,6 @@ const base::FilePath::CharType kApplicationDataBaseDir[] = FILE_PATH_LITERAL("db
 
 #if defined(OS_TIZEN)
 bool GetDirAppDataTizen(base::FilePath& result) {
-#if TIZEN_VERSION_AT_LEAST(2,4,0)
   char* buffer;
 
   if (!(buffer = app_get_data_path()))
@@ -46,15 +43,6 @@ bool GetDirAppDataTizen(base::FilePath& result) {
 
   result = base::FilePath(buffer);
   free(buffer);
-#else
-  const size_t buffer_size = 512;
-  char buffer[buffer_size];
-
-  if (!app_get_data_directory(buffer, buffer_size))
-    return false;
-
-  result = base::FilePath(buffer);
-#endif
   return true;
 }
 
@@ -87,20 +75,17 @@ base::FilePath GetDirCacheTizen() {
 base::FilePath GetDirDownloads() {
 #if !defined(OS_TIZEN)
   return base::FilePath(FILE_PATH_LITERAL("/tmp/"));
-#elif TIZEN_VERSION_AT_LEAST(3,0,0)
-  return base::FilePath(FILE_PATH_LITERAL(tzplatform_getenv(TZ_USER_DOWNLOADS)));
 #else
-  return base::FilePath(FILE_PATH_LITERAL("/opt/usr/media/Downloads/"));
+  return base::FilePath(
+      FILE_PATH_LITERAL(tzplatform_getenv(TZ_USER_DOWNLOADS)));
 #endif
 }
 
 base::FilePath GetDirImages() {
 #if !defined(OS_TIZEN)
   return base::FilePath(FILE_PATH_LITERAL("/tmp/"));
-#elif TIZEN_VERSION_AT_LEAST(3,0,0)
-  return base::FilePath(FILE_PATH_LITERAL(tzplatform_getenv(TZ_USER_IMAGES)));
 #else
-  return base::FilePath(FILE_PATH_LITERAL("/opt/usr/media/Images/"));
+  return base::FilePath(FILE_PATH_LITERAL(tzplatform_getenv(TZ_USER_IMAGES)));
 #endif
 }
 
index 54c9f66..0ca9429 100644 (file)
@@ -314,17 +314,13 @@ void MediaPlayerBridgeCapi::SetRate(double rate) {
     return;
   }
 
-#if TIZEN_VERSION_EQ(3,0,0)
-  if (!is_file_url_ && player_set_streaming_playback_rate(
-          player_,
-          static_cast<float>(rate)) != PLAYER_ERROR_NONE) {
+  if (!is_file_url_ &&
+      player_set_streaming_playback_rate(player_, static_cast<float>(rate)) !=
+          PLAYER_ERROR_NONE) {
     LOG(ERROR) << "|player_set_streaming_playback_rate| failed";
     return;
-  } else
-#endif
-  if (player_set_playback_rate(
-          player_,
-          static_cast<float>(rate)) != PLAYER_ERROR_NONE) {
+  } else if (player_set_playback_rate(player_, static_cast<float>(rate)) !=
+             PLAYER_ERROR_NONE) {
     LOG(ERROR) << "|player_set_playback_rate| failed";
     return;
   }
index 4145710..c2735ea 100644 (file)
@@ -5,11 +5,7 @@
 #include "common/version_info.h"
 
 #if defined(OS_TIZEN)
-#if !TIZEN_VERSION_EQ(2,3,0)
 #include "system_info.h"
-#else
-#include "system_info_internal.h"
-#endif
 #endif
 
 #include "base/command_line.h"
@@ -79,32 +75,20 @@ std::string VersionInfo::OSType() const {
   std::string device_model_str;
   std::string tizen_version_str;
   std::string platform_name_str;
-#if TIZEN_VERSION_AT_LEAST(2,4,0)
   int result = system_info_get_platform_string("http://tizen.org/feature/platform.version",
                                                &tizen_version);
-#else
-  int result = system_info_get_value_string(SYSTEM_INFO_KEY_TIZEN_VERSION, &tizen_version);
-#endif
   if (result == SYSTEM_INFO_ERROR_NONE) {
     tizen_version_str.assign(tizen_version);
     free(tizen_version);
   }
-#if TIZEN_VERSION_AT_LEAST(2,4,0)
   result = system_info_get_platform_string("http://tizen.org/system/platform.name",
                                            &platform_name);
-#else
-  result = system_info_get_value_string(SYSTEM_INFO_KEY_PLATFORM_NAME, &platform_name);
-#endif
   if (result == SYSTEM_INFO_ERROR_NONE) {
     platform_name_str.assign(platform_name);
     free(platform_name);
   }
-#if TIZEN_VERSION_AT_LEAST(2,4,0)
   result = system_info_get_platform_string("http://tizen.org/system/model_name",
                                            &device_model);
-#else
-  result = system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &device_model);
-#endif
   if (result == SYSTEM_INFO_ERROR_NONE) {
     device_model_str.assign(device_model);
     free(device_model);
diff --git a/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc b/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc
deleted file mode 100644 (file)
index 7afd644..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: chromium-ewk
-Description: EWK API based on chromium-efl engine
-Version: 53.2785.0.36-1
-Requires: chromium-efl
-Libs: -L${libdir} -lchromium-ewk
-Cflags: -I${includedir}/chromium-ewk
index 60e050b..7de233b 100644 (file)
@@ -35,7 +35,6 @@ executable("efl_webview_app") {
     "//tizen_src/ewk/efl_integration:chromium-ewk",
     "//tizen_src/ewk/efl_integration:launch_exec",
   ]
-  import("../tizen_version_defines_for_apps.gni")
   cflags = [
     # Treat warning as error for this target.
     # It needs to be included by means of pattern list because '-Werror' cflag
@@ -82,7 +81,10 @@ executable("mini_browser") {
       "browser-string.h",
       "mini_browser.c",
     ]
-    include_dirs += [ "../efl_integration" ]
+    include_dirs += [
+      "../efl_integration",
+      "../../chromium_impl/build",
+    ]
     configs += [ "//tizen_src/build:capi-system-device" ]
     configs += [ "//tizen_src/build:libcapi-system-device" ]
     public_configs = [ "//tizen_src/build:capi-system-device-public" ]
@@ -109,7 +111,6 @@ executable("mini_browser") {
       #"//build/linux:glib",   removed from the chromium
     ]
     configs += [ "//build/config/linux:glib" ]
-    import("../tizen_version_defines_for_apps.gni")
     if (!use_wayland) {
       configs += [ "//tizen_src/build:ecore-x" ]
       configs += [ "//tizen_src/build:libecore-x" ]
diff --git a/tizen_src/ewk/efl_webview_app/chromium-efl.xml b/tizen_src/ewk/efl_webview_app/chromium-efl.xml
deleted file mode 100644 (file)
index bb8afce..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="53.2785.0.36">
-    <label> mini browser application for chromium-efl package </label>
-    <author href="www.samsung.com" email="sns.park@samsung.com">SWC</author>
-    <description> mini browser application based on chromium-efl </description>
-    <ui-application appid="org.tizen.mini-browser" exec="/usr/bin/mini_browser" nodisplay="false" multiple="false" type="capp" taskmanage="true">
-        <icon>/opt/share/icons/mini-browser.png</icon>
-        <label>Chromium-efl MiniBrowser</label>
-        <label xml:lang="en-us">Chromium-efl MiniBrowser</label>
-    </ui-application>
-    <privileges>
-      <privilege>http://tizen.org/privilege/location</privilege>
-      <privilege>http://tizen.org/privilege/internet</privilege>
-      <privilege>http://tizen.org/privilege/network.get</privilege>
-      <privilege>http://tizen.org/privilege/camera</privilege>
-      <privilege>http://tizen.org/privilege/videorecorder</privilege>
-    </privileges>
-</manifest>
diff --git a/tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml b/tizen_src/ewk/efl_webview_app/chromium-efl_v3.0.xml
deleted file mode 100644 (file)
index 5036b0a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.chromium-efl" version="53.2785.0.36">
-    <label> mini browser application for chromium-efl package </label>
-    <author href="www.samsung.com" email="sns.park@samsung.com">SWC</author>
-    <description> mini browser application based on chromium-efl </description>
-    <ui-application appid="org.tizen.chromium-efl" exec="/usr/apps/org.tizen.chromium-efl/bin/mini_browser" nodisplay="false" multiple="false" type="capp" taskmanage="true">
-        <icon>/opt/share/icons/mini-browser.png</icon>
-        <label>Chromium-efl MiniBrowser</label>
-        <label xml:lang="en-us">Chromium-efl MiniBrowser</label>
-    </ui-application>
-    <privileges>
-      <privilege>http://tizen.org/privilege/location</privilege>
-      <privilege>http://tizen.org/privilege/internet</privilege>
-      <privilege>http://tizen.org/privilege/network.get</privilege>
-    </privileges>
-</manifest>
diff --git a/tizen_src/ewk/efl_webview_app/efl_webview_app.png b/tizen_src/ewk/efl_webview_app/efl_webview_app.png
new file mode 100644 (file)
index 0000000..66cac1f
Binary files /dev/null and b/tizen_src/ewk/efl_webview_app/efl_webview_app.png differ
index 7cfc9a4..c74df04 100644 (file)
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <tizen_version.h>
 
 #if defined(OS_TIZEN)
 #include <device/haptic.h>
@@ -715,10 +716,8 @@ int main(int argc, char** argv)
 {
   LOGD(" Minibrowser main\n");
 
-#if defined(TIZEN_V_3_0)
   if (setenv("ELM_ENGINE","gl",1)==0)
     LOGD("'ELM_ENGINE' has been set to 'gl' value.\n");
-#endif
 
   //FIXME: this is temporal code.
   ewk_set_arguments(argc, argv);
diff --git a/tizen_src/ewk/efl_webview_app/org.tizen.chromium-efl.xml.in b/tizen_src/ewk/efl_webview_app/org.tizen.chromium-efl.xml.in
new file mode 100644 (file)
index 0000000..6179b92
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="@TIZEN_VERSION@" package="org.tizen.chromium-efl" version="@CHROMIUM_VERSION@">
+    <label> mini browser application for chromium-efl package </label>
+    <author href="www.samsung.com" email="sns.park@samsung.com">SamsungResearch</author>
+    <description> mini browser application based on chromium-efl </description>
+    <ui-application appid="org.tizen.chromium-efl.ubrowser" exec="@TZ_SYS_RO_APP@/org.tizen.chromium-efl/bin/ubrowser" nodisplay="true" multiple="false" type="capp" taskmanage="true">
+        <icon>@ICON_DIR@/ubrowser.png</icon>
+        <label>Chromium-efl ubrowser</label>
+        <label xml:lang="en-us">Chromium-efl ubrowser</label>
+    </ui-application>
+    <ui-application appid="org.tizen.chromium-efl.mini_browser" exec="@TZ_SYS_RO_APP@/org.tizen.chromium-efl/bin/mini_browser" nodisplay="true" multiple="false" type="capp" taskmanage="true">
+        <icon>@ICON_DIR@/mini_browser.png</icon>
+        <label>Chromium-efl mini_browser</label>
+        <label xml:lang="en-us">Chromium-efl MiniBrowser</label>
+    </ui-application>
+    <ui-application appid="org.tizen.chromium-efl.efl_webview_app" exec="@TZ_SYS_RO_APP@/org.tizen.chromium-efl/bin/efl_webview_app" nodisplay="true" multiple="false" type="capp" taskmanage="true">
+        <icon>@ICON_DIR@/efl_webview_app.png</icon>
+        <label>Chromium-efl efl_webview_app</label>
+        <label xml:lang="en-us">Chromium-efl efl_webview_app</label>
+    </ui-application>
+    <privileges>
+        <privilege>http://tizen.org/privilege/location</privilege>
+        <privilege>http://tizen.org/privilege/internet</privilege>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
+    </privileges>
+</manifest>
diff --git a/tizen_src/ewk/efl_webview_app/ubrowser.xml b/tizen_src/ewk/efl_webview_app/ubrowser.xml
deleted file mode 100644 (file)
index 9bf7602..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="53.2785.0.36"
-    <label> micro browser application for chromium-efl package </label>
-    <author href="www.samsung.com" email="m.lapinski@samsung.com">SWC</author>
-    <description> micro browser application based on chromium-efl </description>
-    <ui-application appid="org.tizen.ubrowser" exec="/usr/apps/org.tizen.chromium-efl/bin/ubrowser" nodisplay="false" multiple="false" type="capp" taskmanage="true">
-        <icon>/opt/share/icons/mini-browser.png</icon>
-        <label>Chromium-efl uBrowser</label>
-        <label xml:lang="en-us">Chromium-efl uBrowser</label>
-    </ui-application>
-    <privileges>
-      <privilege>http://tizen.org/privilege/location</privilege>
-      <privilege>http://tizen.org/privilege/internet</privilege>
-      <privilege>http://tizen.org/privilege/network.get</privilege>
-      <privilege>http://tizen.org/privilege/camera</privilege>
-      <privilege>http://tizen.org/privilege/videorecorder</privilege>
-    </privileges>
-</manifest>
diff --git a/tizen_src/ewk/efl_webview_app/ubrowser_v3.0.xml b/tizen_src/ewk/efl_webview_app/ubrowser_v3.0.xml
deleted file mode 100644 (file)
index 4d674f3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.chromium-efl" version="53.2785.0.36">
-    <label> micro browser application for chromium-efl package </label>
-    <author href="www.samsung.com" email="m.lapinski@samsung.com">SWC</author>
-    <description> micro browser application based on chromium-efl </description>
-    <ui-application appid="org.tizen.chromium-efl" exec="/usr/apps/org.tizen.chromium-efl/bin/ubrowser" nodisplay="false" multiple="false" type="capp" taskmanage="true">
-        <icon>/opt/share/icons/mini-browser.png</icon>
-        <label>Chromium-efl uBrowser</label>
-        <label xml:lang="en-us">Chromium-efl uBrowser</label>
-    </ui-application>
-    <privileges>
-      <privilege>http://tizen.org/privilege/location</privilege>
-      <privilege>http://tizen.org/privilege/internet</privilege>
-      <privilege>http://tizen.org/privilege/network.get</privilege>
-    </privileges>
-</manifest>
diff --git a/tizen_src/ewk/tizen_version_defines_for_apps.gni b/tizen_src/ewk/tizen_version_defines_for_apps.gni
deleted file mode 100644 (file)
index aafae4c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2015 Samsung Electronics. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tizen_src/build/config/tizen_features.gni")
-
-defines = []
-
-if (is_tizen) {
-  if (chromium_efl_tizen_version == 30) {
-    defines += [ "TIZEN_V_3_0=true" ]
-  }
-  if (chromium_efl_tizen_version == 24) {
-    defines += [ "TIZEN_V_2_4=true" ]
-  }
-  if (chromium_efl_tizen_version == 23) {
-    defines += [ "TIZEN_V_2_3=true" ]
-  }
-}
diff --git a/tizen_src/ewk/ubrowser/ubrowser.xml b/tizen_src/ewk/ubrowser/ubrowser.xml
deleted file mode 100644 (file)
index c8f2ad4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="53.2785.0.36">
-    <label>uBrowser application for chromium-efl package</label>
-    <author href="www.samsung.com" email="p.tworek@samsung.com">SRPOL</author>
-    <description>Small reference browser application for chromium-efl port</description>
-    <ui-application appid="org.tizen.ubrowser" exec="/usr/bin/ubrowser" nodisplay="false" multiple="false" type="capp" taskmanage="true">
-        <icon>/opt/share/icons/ubrowser.png</icon>
-        <label>uBrowser</label>
-        <label xml:lang="en-us">uBrowser</label>
-    </ui-application>
-</manifest>