Integrate chromedriver in a simpler way.

In patches [1] and [2], chromedriver was originally
integrated to chromium-efl by forking chrome/chrome_tests.gypi
and making the needed changes: ewk/efl_integration/chromedriver_efl.gypi.

After studying chromedriver build, it was found out that
chrome/chrome.gyp is its main entry point.
Given that chrome.gyp does far more than only warm-up
chromedriver builds, it is not feasible to simply
including it from chromium-efl side.

This patch relies on the s-chromium patch [3] in order to
simplify our chromedriver integration. Now, chromedriver_efl.gypi
(our fork) can be deleted, and we can simply build
'chromedriver' target, instead of 'chromedriver_efl'
Also, we can refer to 'chromedriver' everywhere instead
of 'chromedriver_efl'.

[1] http://165.213.202.130/gerrit/#/c/83743
[2] http://165.213.202.130/gerrit/#/c/83742
[3] http://165.213.202.130/gerrit/#/c/95036

Original beta/m42 patch:
- http://165.213.202.130/gerrit/#/c/85836/ reviewed by
Janusz Majnert, SeungSeop Park.

Together with: Id66b0fe16d6f94c7698dc056f3f1f71f4e536e5f

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14773

Reviewed by: a.renevier, a1.gomes, sns.park

Change-Id: I314e3853fb740848102026cbdeaa6881242ac8c0
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 6917b60..22686e8 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -154,7 +154,7 @@ function hostNinja() {
       TARGETS="$TARGETS xwalk"
     fi
     if [[ $BUILD_CHROMEDRIVER == 1 ]]; then
-      TARGETS="$TARGETS chromedriver_efl"
+      TARGETS="$TARGETS chromedriver"
     fi
     BUILDDIR=${GYP_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY}
     ninja -C $BUILDDIR ${JOBS} ${TARGETS}

diff --git a/tizen_src/chromium_impl/chrome/chrome_tests_efl.gypi b/tizen_src/chromium_impl/chrome/chrome_tests_efl.gypi
new file mode 100644 (file)
index 0000000..8c653b3
--- /dev/null
+++ b/tizen_src/chromium_impl/chrome/chrome_tests_efl.gypi
@@ -0,0 +1,22 @@
+# 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.
+
+{
+  'target_defaults': {
+    'target_conditions': [
+      ['_target_name=="chromedriver_lib"', {
+        'sources/': [
+          ['exclude', 'test/chromedriver/keycode_text_conversion_win\\.cc$'],
+        ],
+        'conditions': [
+          ['use_wayland==1', {
+            'sources/': [
+              ['exclude', 'test/chromedriver/keycode_text_conversion_x\\.cc$'],
+            ],
+          }], # use_wayland==1
+        ], # conditions
+      }],
+    ], # target_conditions
+  }, # target_defaults
+}

diff --git a/tizen_src/chromium_impl/chromium_impl.gypi b/tizen_src/chromium_impl/chromium_impl.gypi
index 7eaafb4..a52aefc 100644 (file)
--- a/tizen_src/chromium_impl/chromium_impl.gypi
+++ b/tizen_src/chromium_impl/chromium_impl.gypi
@@ -5,6 +5,7 @@
 {
   'includes': [
     'base/base_efl.gypi',
+    'chrome/chrome_tests_efl.gypi',
     'content/content_efl.gypi',
     'device/vibration_efl.gypi',
     'gpu/gpu_efl.gypi',

diff --git a/tizen_src/ewk/chromium-ewk.gyp b/tizen_src/ewk/chromium-ewk.gyp
index 9dd36d7..9063fe0 100644 (file)
--- a/tizen_src/ewk/chromium-ewk.gyp
+++ b/tizen_src/ewk/chromium-ewk.gyp
@@ -12,7 +12,7 @@
         'unittest/ewk-tests.gypi:*',
         'ubrowser/ubrowser.gypi:*',
         'efl_webview_app/efl_webview_app.gypi:*',
-        'efl_integration/chromedriver_efl.gypi:*',
+        '../../chrome/chrome_tests.gypi:chromedriver',
       ],
     },
   ],

diff --git a/tizen_src/ewk/efl_integration/chromedriver_efl.gypi b/tizen_src/ewk/efl_integration/chromedriver_efl.gypi
deleted file mode 100644 (file)
index b23ba7b..0000000
--- a/tizen_src/ewk/efl_integration/chromedriver_efl.gypi
+++ /dev/null
@@ -1,295 +0,0 @@
-{
-  'variables': {
-    'chrome_automation_client_lib_efl_sources': [
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/adb.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/adb_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/adb_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/automation_extension.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/automation_extension.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_android_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_android_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_desktop_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_finder.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_finder.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_remote_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/chrome_remote_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/console_logger.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/console_logger.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/debugger_tracker.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/debugger_tracker.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/device_manager.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/device_manager.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/device_metrics.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/device_metrics.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/devtools_client.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/devtools_client_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/devtools_client_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/devtools_event_listener.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/devtools_event_listener.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/devtools_http_client.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/devtools_http_client.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/dom_tracker.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/dom_tracker.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/frame_tracker.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/frame_tracker.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/geolocation_override_manager.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/geolocation_override_manager.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/geoposition.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/heap_snapshot_taker.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/heap_snapshot_taker.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/javascript_dialog_manager.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/javascript_dialog_manager.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/log.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/log.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/mobile_device.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/mobile_device.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/mobile_device_list.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/mobile_device_list.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/navigation_tracker.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/navigation_tracker.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/status.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/status.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/ui_events.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/ui_events.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/util.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/util.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/version.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/version.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/web_view.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/web_view_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/web_view_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/adb_client_socket.cc',
-      '<(DEPTH)/chrome/test/chromedriver/net/adb_client_socket.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/net_util.cc',
-      '<(DEPTH)/chrome/test/chromedriver/net/net_util.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/port_server.cc',
-      '<(DEPTH)/chrome/test/chromedriver/net/port_server.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/sync_websocket.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/sync_websocket_factory.cc',
-      '<(DEPTH)/chrome/test/chromedriver/net/sync_websocket_factory.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/sync_websocket_impl.cc',
-      '<(DEPTH)/chrome/test/chromedriver/net/sync_websocket_impl.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/url_request_context_getter.cc',
-      '<(DEPTH)/chrome/test/chromedriver/net/url_request_context_getter.h',
-      '<(DEPTH)/chrome/test/chromedriver/net/websocket.cc',
-      '<(DEPTH)/chrome/test/chromedriver/net/websocket.h',
-    ],
-    'chrome_driver_lib_efl_sources': [
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.cc',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.h',
-      '<(DEPTH)/chrome/../third_party/webdriver/atoms.cc',
-      '<(DEPTH)/chrome/../third_party/webdriver/atoms.h',
-      '<(DEPTH)/chrome/common/chrome_constants.cc',
-      '<(DEPTH)/chrome/common/chrome_constants.h',
-      '<(DEPTH)/chrome/test/chromedriver/alert_commands.cc',
-      '<(DEPTH)/chrome/test/chromedriver/alert_commands.h',
-      '<(DEPTH)/chrome/test/chromedriver/basic_types.cc',
-      '<(DEPTH)/chrome/test/chromedriver/basic_types.h',
-      '<(DEPTH)/chrome/test/chromedriver/capabilities.cc',
-      '<(DEPTH)/chrome/test/chromedriver/capabilities.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/browser_info.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome/browser_info.h',
-      '<(DEPTH)/chrome/test/chromedriver/chrome_launcher.cc',
-      '<(DEPTH)/chrome/test/chromedriver/chrome_launcher.h',
-      '<(DEPTH)/chrome/test/chromedriver/command_listener.h',
-      '<(DEPTH)/chrome/test/chromedriver/command_listener_proxy.cc',
-      '<(DEPTH)/chrome/test/chromedriver/command_listener_proxy.h',
-      '<(DEPTH)/chrome/test/chromedriver/command.h',
-      '<(DEPTH)/chrome/test/chromedriver/commands.cc',
-      '<(DEPTH)/chrome/test/chromedriver/commands.h',
-      '<(DEPTH)/chrome/test/chromedriver/element_commands.cc',
-      '<(DEPTH)/chrome/test/chromedriver/element_commands.h',
-      '<(DEPTH)/chrome/test/chromedriver/element_util.cc',
-      '<(DEPTH)/chrome/test/chromedriver/element_util.h',
-      '<(DEPTH)/chrome/test/chromedriver/key_converter.cc',
-      '<(DEPTH)/chrome/test/chromedriver/key_converter.h',
-      '<(DEPTH)/chrome/test/chromedriver/keycode_text_conversion.h',
-      '<(DEPTH)/chrome/test/chromedriver/keycode_text_conversion_ozone.cc',
-      '<(DEPTH)/chrome/test/chromedriver/logging.cc',
-      '<(DEPTH)/chrome/test/chromedriver/logging.h',
-      '<(DEPTH)/chrome/test/chromedriver/performance_logger.cc',
-      '<(DEPTH)/chrome/test/chromedriver/performance_logger.h',
-      '<(DEPTH)/chrome/test/chromedriver/server/http_handler.cc',
-      '<(DEPTH)/chrome/test/chromedriver/server/http_handler.h',
-      '<(DEPTH)/chrome/test/chromedriver/session.cc',
-      '<(DEPTH)/chrome/test/chromedriver/session.h',
-      '<(DEPTH)/chrome/test/chromedriver/session_commands.cc',
-      '<(DEPTH)/chrome/test/chromedriver/session_commands.h',
-      '<(DEPTH)/chrome/test/chromedriver/session_thread_map.h',
-      '<(DEPTH)/chrome/test/chromedriver/util.cc',
-      '<(DEPTH)/chrome/test/chromedriver/util.h',
-      '<(DEPTH)/chrome/test/chromedriver/window_commands.cc',
-      '<(DEPTH)/chrome/test/chromedriver/window_commands.h',
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'automation_client_lib_efl',
-      'type': 'static_library',
-      'hard_dependency': 1,
-      'dependencies': [
-        '<(DEPTH)/tizen_src/ewk/efl_integration/efl_integration.gypi:chromium-ewk',
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/third_party/zlib/zlib.gyp:*',
-        '<(DEPTH)/third_party/zlib/google/zip.gyp:*',
-        '<(DEPTH)/ui/accessibility/accessibility.gyp:ax_gen',
-        '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-        '<(DEPTH)/url/url.gyp:url_lib',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/chrome',
-        '<(SHARED_INTERMEDIATE_DIR)',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)',
-        ],
-      },
-      'sources': [
-        '<@(chrome_automation_client_lib_efl_sources)',
-      ],
-      'actions': [
-        {
-          'action_name': 'embed_js_in_cpp',
-          'inputs': [
-            '<(DEPTH)/chrome/test/chromedriver/cpp_source.py',
-            '<(DEPTH)/chrome/test/chromedriver/embed_js_in_cpp.py',
-            '<(DEPTH)/chrome/test/chromedriver/js/add_cookie.js',
-            '<(DEPTH)/chrome/test/chromedriver/js/call_function.js',
-            #'<(DEPTH)/chrome/test/chromedriver/js/dispatch_context_menu_event.js',
-            '<(DEPTH)/chrome/test/chromedriver/js/execute_async_script.js',
-            '<(DEPTH)/chrome/test/chromedriver/js/focus.js',
-            '<(DEPTH)/chrome/test/chromedriver/js/get_element_region.js',
-            '<(DEPTH)/chrome/test/chromedriver/js/is_option_element_toggleable.js',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h',
-          ],
-          'action': [ 'python',
-                      '<(DEPTH)/chrome/test/chromedriver/embed_js_in_cpp.py',
-                      '--directory',
-                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
-                      '<(DEPTH)/chrome/test/chromedriver/js/add_cookie.js',
-                      '<(DEPTH)/chrome/test/chromedriver/js/call_function.js',
-                      #'<(DEPTH)/chrome/test/chromedriver/js/dispatch_context_menu_event.js',
-                      '<(DEPTH)/chrome/test/chromedriver/js/execute_async_script.js',
-                      '<(DEPTH)/chrome/test/chromedriver/js/focus.js',
-                      '<(DEPTH)/chrome/test/chromedriver/js/get_element_region.js',
-                      '<(DEPTH)/chrome/test/chromedriver/js/is_option_element_toggleable.js',
-          ],
-          'message': 'Generating sources for embedding js in chromedriver',
-        },
-        {
-          'action_name': 'embed_user_data_dir_in_cpp',
-          'inputs': [
-            '<(DEPTH)/chrome/test/chromedriver/cpp_source.py',
-            '<(DEPTH)/chrome/test/chromedriver/embed_user_data_dir_in_cpp.py',
-            '<(DEPTH)/chrome/test/chromedriver/chrome/preferences.txt',
-            '<(DEPTH)/chrome/test/chromedriver/chrome/local_state.txt',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h',
-          ],
-          'action': [ 'python',
-                      '<(DEPTH)/chrome/test/chromedriver/embed_user_data_dir_in_cpp.py',
-                      '--directory',
-                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
-                      '<(DEPTH)/chrome/test/chromedriver/chrome/preferences.txt',
-                      '<(DEPTH)/chrome/test/chromedriver/chrome/local_state.txt',
-          ],
-          'message': 'Generating sources for embedding user data dir in chromedriver',
-        },
-        {
-          'action_name': 'embed_extension_in_cpp',
-          'inputs': [
-            '<(DEPTH)/chrome/test/chromedriver/cpp_source.py',
-            '<(DEPTH)/chrome/test/chromedriver/embed_extension_in_cpp.py',
-            '<(DEPTH)/chrome/test/chromedriver/extension/background.js',
-            '<(DEPTH)/chrome/test/chromedriver/extension/manifest.json',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h',
-          ],
-          'action': [ 'python',
-                      '<(DEPTH)/chrome/test/chromedriver/embed_extension_in_cpp.py',
-                      '--directory',
-                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
-                      '<(DEPTH)/chrome/test/chromedriver/extension/background.js',
-                      '<(DEPTH)/chrome/test/chromedriver/extension/manifest.json',
-          ],
-          'message': 'Generating sources for embedding automation extension',
-        },
-      ],
-    },
-    {
-      'target_name': 'chromedriver_lib_efl',
-      'type': 'static_library',
-      'hard_dependency': 1,
-      'dependencies': [
-        'automation_client_lib_efl',
-        '<(DEPTH)/crypto/crypto.gyp:crypto',
-        '<(DEPTH)/net/net.gyp:http_server',
-        '<(DEPTH)/ui/events/events.gyp:events_base',
-      ],
-      'sources': [
-        '<@(chrome_driver_lib_efl_sources)',
-      ],
-      'actions': [
-        {
-          'action_name': 'embed_version_in_cpp',
-          'inputs': [
-            '<(DEPTH)/chrome/test/chromedriver/cpp_source.py',
-            '<(DEPTH)/chrome/test/chromedriver/embed_version_in_cpp.py',
-            '<(DEPTH)/chrome/test/chromedriver/VERSION',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.h',
-          ],
-          'action': [ 'python',
-                      '<(DEPTH)/chrome/test/chromedriver/embed_version_in_cpp.py',
-                      '--version-file',
-                      '<(DEPTH)/chrome/test/chromedriver/VERSION',
-                      '--directory',
-                      '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver',
-          ],
-          'message': 'Generating version info',
-        },
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)',
-        ],
-      },
-    },
-    {
-      'target_name': 'chromedriver_efl',
-      'type': 'executable',
-      'dependencies': [
-        'chromedriver_lib_efl',
-      ],
-      'sources': [
-        '<(DEPTH)/chrome/test/chromedriver/server/chromedriver_server.cc',
-      ],
-    },
-  ],
-}

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index c0aeccb..26dd1d8 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -374,7 +374,7 @@ tizen_src/build/prebuild/ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
   ewk_unittests \
 %endif
 %if 0%{?build_chromedriver}
-  chromedriver_efl \
+  chromedriver \
 %endif
 %if 0%{?build_xwalk}
   xwalk xwalk_application_tools \
@@ -493,7 +493,7 @@ install -m 0644 tizen_src/ewk/efl_integration/public/*.h                  "%{bui
 install -m 0644 v8/include/*.h "%{buildroot}"%{_includedir}/v8/
 
 %if 0%{?build_chromedriver}
-install -m 0755 "%{OUTPUT_FOLDER}"/chromedriver_efl "%{buildroot}"/usr/apps/com.samsung.chromedriver/bin
+install -m 0755 "%{OUTPUT_FOLDER}"/chromedriver "%{buildroot}"/usr/apps/com.samsung.chromedriver/bin
 install -m 0755 tizen_src/scripts/start-chrome-driver.sh "%{buildroot}"/%{_bindir}
 %endif
 

diff --git a/tizen_src/scripts/start-chrome-driver.sh b/tizen_src/scripts/start-chrome-driver.sh
index d13700d..ba364ea 100644 (file)
--- a/tizen_src/scripts/start-chrome-driver.sh
+++ b/tizen_src/scripts/start-chrome-driver.sh
@@ -2,4 +2,4 @@
 
 echo "Starting chromedriver for chromium M42 for Tizen 3.0"
 
-/usr/apps/com.samsung.chromedriver/bin/chromedriver_efl --whitelisted-ips
+/usr/apps/com.samsung.chromedriver/bin/chromedriver --whitelisted-ips