Merge lp:~abreu-alexandre/oxide/remove-chromedriver-build into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Remove chromedriver's build.

Remove chromedriver's build. Upstream's build of chromedriver works well for our purpose,

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-24 22:01:01 +0000
+++ CMakeLists.txt	2016-03-01 16:33:42 +0000
@@ -142,9 +142,6 @@
     ${CHROMIUM_PRODUCT_DIR}/natives_blob.bin
     ${CHROMIUM_PRODUCT_DIR}/snapshot_blob.bin)
 set(_OXIDE_INSTALL_PROGRAMS ${CHROMIUM_PRODUCT_DIR}/${OXIDE_RENDERER})
-if(ENABLE_CHROMEDRIVER)
-  list(APPEND _OXIDE_INSTALL_PROGRAMS ${CHROMIUM_PRODUCT_DIR}/chromedriver)
-endif()
 set(_CHROME_SANDBOX ${CHROMIUM_PRODUCT_DIR}/chrome-sandbox)
 set(_OXIDE_INSTALL_LOCALEDIR ${CHROMIUM_PRODUCT_DIR}/locales)
 
@@ -262,11 +259,6 @@
 else()
   list(APPEND _GYP_COMMAND -Denable_plugins=0)
 endif()
-if(ENABLE_CHROMEDRIVER)
-  list(APPEND _GYP_COMMAND -Denable_chromedriver_build=1)
-else()
-  list(APPEND _GYP_COMMAND -Denable_chromedriver_build=0)
-endif()
 if(ENABLE_TCMALLOC)
   list(APPEND _GYP_COMMAND -Denable_tcmalloc=1)
 else()
 
=== modified file 'build/all.gyp'
--- build/all.gyp	2016-01-18 19:58:02 +0000
+++ build/all.gyp	2016-03-01 16:33:42 +0000
@@ -22,15 +22,7 @@
       'dependencies': [
         '<@(oxide_lib_target)',
         '<@(oxide_renderer_target)',
-        '<(DEPTH)/sandbox/sandbox.gyp:chrome_sandbox',
-      ],
-      'conditions': [
-        ['enable_chromedriver_build==1', {
-            'dependencies': [
-              '<(DEPTH)/chrome/chrome.gyp:chromedriver',
-            ],
-          }
-        ]
+        '<(DEPTH)/sandbox/sandbox.gyp:chrome_sandbox'
       ]
     }
   ]
 
=== modified file 'build/cmake/OxideCommonOptions.cmake'
--- build/cmake/OxideCommonOptions.cmake	2016-01-21 14:36:08 +0000
+++ build/cmake/OxideCommonOptions.cmake	2016-03-01 16:33:42 +0000
@@ -30,7 +30,6 @@
 option(ENABLE_PLUGINS
        "Enable support for PPAPI plugins. Only Flash is supported right now"
        ON)
-option(ENABLE_CHROMEDRIVER "Build the chromedriver binary" OFF)
 option(ENABLE_TCMALLOC "Use TCMalloc in the renderer executable" ON)
 option(USE_SYSTEM_PROTOBUF "Use the system protobuf" OFF)
 option(ENABLE_HYBRIS "Enable code that uses libhybris" ON)
 
=== modified file 'build/common.gypi'
--- build/common.gypi	2015-12-22 20:59:56 +0000
+++ build/common.gypi	2016-03-01 16:33:42 +0000
@@ -35,7 +35,6 @@
     'use_libpci': 1,
     'use_ozone': 1,
     'toolkit_views': 0,
-    'remoting': 0,
     'enable_basic_printing': 0,
     'enable_print_preview': 0,
     'variables': {
 
=== modified file 'build/gyp_oxide'
--- build/gyp_oxide	2015-11-12 19:17:40 +0000
+++ build/gyp_oxide	2016-03-01 16:33:42 +0000
@@ -42,9 +42,6 @@
 sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'chrome', 'tools', 'build'))
 sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'third_party', 'WebKit', 'Source', 'build', 'scripts'))
 
-## Needed to build chrome driver and as one of its deps pulls remoting.gyp or one of its deps
-sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'remoting', 'tools', 'build'))
-
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "scripts"))
 
 def additional_include_files(args=[]):