[NextBrowser] Added UWE as dependency of NextBrowser

Change-Id: Ia0766d0a25ad1d445bcbc1d4ebd383bce8c5fcd5
Signed-off-by: saurabh.t3 <saurabh.t3@samsung.com>

diff --git a/components/samsung/data_sync_service/BUILD.gn b/components/samsung/data_sync_service/BUILD.gn
index e225136f542a57912d54d093507f80375afef093..b40521bb9523b15201b0519b7fa9180ae1382801 100644 (file)
--- a/components/samsung/data_sync_service/BUILD.gn
+++ b/components/samsung/data_sync_service/BUILD.gn
@@ -22,8 +22,6 @@ source_set("data_sync_service") {
   lib_dirs = ["../samsung_cloud/"]
   libs = [ "samsungcloud" ]
 
-  ldflags = [ "-Wl,-rpath=\$ORIGIN/../lib" ]
-
   configs += [
    "//tizen_src/build:ecore",
    "//tizen_src/build:libecore",

diff --git a/packaging/org.tizen.next-browser.xml.in b/packaging/org.tizen.next-browser.xml.in
index 0447b17ecb2b5b4a5f696057d7f69984b1c04839..2e37f5151adf924d124846483800a3806388f8db 100644 (file)
--- a/packaging/org.tizen.next-browser.xml.in
+++ b/packaging/org.tizen.next-browser.xml.in
@@ -38,4 +38,10 @@
         <appdefined-privilege>http://com.samsung.tizen.samsung-cloud/appdefined/samsung-cloud</appdefined-privilege>
     </privileges>
     <feature name="http://tizen.org/feature/screen.size.normal.1080.1920">true</feature>
+    <required-services>
+        <service name="UpgradedWebEngine" min-version="0.1.52120"/>
+    </required-services>
+    <dependencies>
+        <dependency type="requires" required-version="0.1.52120">org.tizen.chromium-efl-upgrade</dependency>
+    </dependencies>
 </manifest>

diff --git a/tizen_src/build/build_next_browser_tpk.sh b/tizen_src/build/build_next_browser_tpk.sh
index 0ba21cdee15349de1ee4f4060fcbb8d6653f596a..6830c780fcb3c832c421dc74910206e3528d4b56 100755 (executable)
--- a/tizen_src/build/build_next_browser_tpk.sh
+++ b/tizen_src/build/build_next_browser_tpk.sh
@@ -61,7 +61,7 @@ install -m 0644 ${output_dir}/snapshot_blob.bin  ${tpk_root}/bin/
 install -m 0644 ${output_dir}/images/*.png    ${tpk_root}/res/images
 install -m 0644 ${output_dir}/resources/*.edj ${tpk_root}/res/themes
 
-install -m 0755 ${ro_lib_root}/lib/libchromium-impl.so ${tpk_root}/lib
+#install -m 0755 ${ro_lib_root}/lib/libchromium-impl.so ${tpk_root}/lib
 install -m 0755 ${output_dir}/libchromium-ewk.so ${tpk_root}/lib
 install -m 0755 ./components/samsung/samsung_cloud/libsamsungcloud.so ${tpk_root}/lib
 

diff --git a/tizen_src/downloadable/ewk_interface_main.cc b/tizen_src/downloadable/ewk_interface_main.cc
index 60220ca65998fd66b8f5293e37b4614e6be14495..f1623d57bee0683c5f44a0d178c835f1fae153e8 100644 (file)
--- a/tizen_src/downloadable/ewk_interface_main.cc
+++ b/tizen_src/downloadable/ewk_interface_main.cc
@@ -670,12 +670,14 @@ __attribute__((visibility("default"))) int ChromeMain(int argc,
   if (isSubprocess) {
     LOG(INFO) << "Subprocess";
     typedef int (*func_ptr_t)(int argc, const char** argv);
+    ewk_set_version_policy(1);  // To support UWE
     func_ptr_t fp = reinterpret_cast<func_ptr_t>(ewk_dlsym("ChromeMain"));
     if (fp)
       return fp(argc, argv);
     return 0;
   } else {
     LOG(INFO) << "Main process";
+    ewk_set_version_policy(1);  // To support UWE
     ui_app_lifecycle_callback_s event_callback;
     memset(&event_callback, 0x00, sizeof(ui_app_lifecycle_callback_s));
     event_callback.create = app_create;

diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index fbe1e9a666aa4f6d1a89d52fccf1aab0483ac495..6e24e3846180fd5109658b0b9b30861e97ae02fb 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -156,7 +156,7 @@ shared_library("chromium-ewk") {
   ]
 
   if(is_samsung_next_browser) {
-  ldflags += [ "-Wl,-rpath=\$ORIGIN/../lib" ]
+  ldflags += [ "-Wl,-rpath=$app_samsung_next_browser_root_dir/lib" ]
   }
 
   if (is_tizen) {