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

Proposed by Alexandre Abreu on 2016-03-01
Status: Merged
Merged at revision: 1373
Proposed branch: lp:~abreu-alexandre/oxide/remove-chromedriver-build
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 84 lines (+1/-22)
5 files modified
CMakeLists.txt (+0/-8)
build/all.gyp (+1/-9)
build/cmake/OxideCommonOptions.cmake (+0/-1)
build/common.gypi (+0/-1)
build/gyp_oxide (+0/-3)
To merge this branch: bzr merge lp:~abreu-alexandre/oxide/remove-chromedriver-build
Reviewer Review Type Date Requested Status
Chris Coulson 2016-03-01 Approve on 2016-03-10
Review via email: mp+287669@code.launchpad.net

Commit message

Remove chromedriver's build.

Description of the change

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

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-02-24 22:01:01 +0000
3+++ CMakeLists.txt 2016-03-01 16:33:42 +0000
4@@ -142,9 +142,6 @@
5 ${CHROMIUM_PRODUCT_DIR}/natives_blob.bin
6 ${CHROMIUM_PRODUCT_DIR}/snapshot_blob.bin)
7 set(_OXIDE_INSTALL_PROGRAMS ${CHROMIUM_PRODUCT_DIR}/${OXIDE_RENDERER})
8-if(ENABLE_CHROMEDRIVER)
9- list(APPEND _OXIDE_INSTALL_PROGRAMS ${CHROMIUM_PRODUCT_DIR}/chromedriver)
10-endif()
11 set(_CHROME_SANDBOX ${CHROMIUM_PRODUCT_DIR}/chrome-sandbox)
12 set(_OXIDE_INSTALL_LOCALEDIR ${CHROMIUM_PRODUCT_DIR}/locales)
13
14@@ -262,11 +259,6 @@
15 else()
16 list(APPEND _GYP_COMMAND -Denable_plugins=0)
17 endif()
18-if(ENABLE_CHROMEDRIVER)
19- list(APPEND _GYP_COMMAND -Denable_chromedriver_build=1)
20-else()
21- list(APPEND _GYP_COMMAND -Denable_chromedriver_build=0)
22-endif()
23 if(ENABLE_TCMALLOC)
24 list(APPEND _GYP_COMMAND -Denable_tcmalloc=1)
25 else()
26
27=== modified file 'build/all.gyp'
28--- build/all.gyp 2016-01-18 19:58:02 +0000
29+++ build/all.gyp 2016-03-01 16:33:42 +0000
30@@ -22,15 +22,7 @@
31 'dependencies': [
32 '<@(oxide_lib_target)',
33 '<@(oxide_renderer_target)',
34- '<(DEPTH)/sandbox/sandbox.gyp:chrome_sandbox',
35- ],
36- 'conditions': [
37- ['enable_chromedriver_build==1', {
38- 'dependencies': [
39- '<(DEPTH)/chrome/chrome.gyp:chromedriver',
40- ],
41- }
42- ]
43+ '<(DEPTH)/sandbox/sandbox.gyp:chrome_sandbox'
44 ]
45 }
46 ]
47
48=== modified file 'build/cmake/OxideCommonOptions.cmake'
49--- build/cmake/OxideCommonOptions.cmake 2016-01-21 14:36:08 +0000
50+++ build/cmake/OxideCommonOptions.cmake 2016-03-01 16:33:42 +0000
51@@ -30,7 +30,6 @@
52 option(ENABLE_PLUGINS
53 "Enable support for PPAPI plugins. Only Flash is supported right now"
54 ON)
55-option(ENABLE_CHROMEDRIVER "Build the chromedriver binary" OFF)
56 option(ENABLE_TCMALLOC "Use TCMalloc in the renderer executable" ON)
57 option(USE_SYSTEM_PROTOBUF "Use the system protobuf" OFF)
58 option(ENABLE_HYBRIS "Enable code that uses libhybris" ON)
59
60=== modified file 'build/common.gypi'
61--- build/common.gypi 2015-12-22 20:59:56 +0000
62+++ build/common.gypi 2016-03-01 16:33:42 +0000
63@@ -35,7 +35,6 @@
64 'use_libpci': 1,
65 'use_ozone': 1,
66 'toolkit_views': 0,
67- 'remoting': 0,
68 'enable_basic_printing': 0,
69 'enable_print_preview': 0,
70 'variables': {
71
72=== modified file 'build/gyp_oxide'
73--- build/gyp_oxide 2015-11-12 19:17:40 +0000
74+++ build/gyp_oxide 2016-03-01 16:33:42 +0000
75@@ -42,9 +42,6 @@
76 sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'chrome', 'tools', 'build'))
77 sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'third_party', 'WebKit', 'Source', 'build', 'scripts'))
78
79-## Needed to build chrome driver and as one of its deps pulls remoting.gyp or one of its deps
80-sys.path.insert(0, os.path.join(CHROMIUMSRCDIR, 'remoting', 'tools', 'build'))
81-
82 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "scripts"))
83
84 def additional_include_files(args=[]):

Subscribers

People subscribed via source and target branches