From c7985f8b9d59e082481131307af237889f528892 Mon Sep 17 00:00:00 2001 From: bridiver Date: Wed, 3 Jul 2019 13:00:34 -0700 Subject: [PATCH] remove chromedriver dep that was carried over from muon and isn't needed at all --- BUILD.gn | 50 ++----------------- app/android/BUILD.gn | 1 - app/ios/BUILD.gn | 1 - app/linux/BUILD.gn | 37 -------------- app/mac/BUILD.gn | 2 - app/win/BUILD.gn | 2 - .../chrome-test-chromedriver-BUILD.gn.patch | 13 ----- patches/net-traffic_annotation-BUILD.gn.patch | 13 ----- script/lib/config.py | 16 ------ script/publish_release.py | 2 +- script/test/test_config.py | 28 ----------- script/upload.py | 6 +-- 12 files changed, 7 insertions(+), 164 deletions(-) delete mode 100644 patches/chrome-test-chromedriver-BUILD.gn.patch delete mode 100644 patches/net-traffic_annotation-BUILD.gn.patch delete mode 100644 script/test/test_config.py diff --git a/BUILD.gn b/BUILD.gn index b7f6c781aa68..dd75ffe7728b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -246,33 +246,6 @@ if (!is_mac && !is_android && !is_ios) { } } -if (target_cpu == "x86") { - target_arch = "ia32" -} else { - target_arch = target_cpu -} - -if (!is_android && !is_ios) { - chromedriver = "chromedriver" - if (is_win) { - chromedriver = "$chromedriver.exe" - } - - chromedriver_version = "2.33" - - copy("brave_chromedriver_dist_resources") { - sources = [ - "$root_out_dir/$chromedriver", - ] - - outputs = [ - "$brave_dist_dir/$chromedriver" - ] - - deps = [ "//chrome/test/chromedriver:chromedriver" ] - } -} - action("generate_chromium_licenses") { license_file = "$root_gen_dir/LICENSES.chromium.html" @@ -357,20 +330,12 @@ if (!is_android && !is_ios) { "$brave_dist_dir/{{source_file_part}}" ] } +} - zip("chromedriver_zip") { - inputs = get_target_outputs(":brave_chromedriver_dist_resources") - inputs += get_target_outputs(":brave_license_dist_resources") - output = "$brave_dist_dir/chromedriver-v$chromedriver_version-$brave_platform-$target_arch.zip" - - base_dir = brave_dist_dir - - deps = [ - "app/$current_os:chromedriver_dist_resources", - ":brave_chromedriver_dist_resources", - ":brave_license_dist_resources", - ] - } +if (target_cpu == "x86") { + target_arch = "ia32" +} else { + target_arch = target_cpu } action("create_symbols_dist") { @@ -378,7 +343,6 @@ action("create_symbols_dist") { script = "//brave/script/create-dist.py" - # inputs = get_target_outputs(":brave_chromedriver_dist_resources") inputs = get_target_outputs(":brave_license_dist_resources") dir_inputs = [ "$brave_project_name.breakpad.syms" ] @@ -455,10 +419,6 @@ action("create_dist_zips") { "app/$current_os:dist_resources", ] - if (!is_android && !is_ios) { - deps += [ ":chromedriver_zip" ] - } - if (!is_mac && !is_android && !is_ios) { deps += [ ":brave_dist_resources", diff --git a/app/android/BUILD.gn b/app/android/BUILD.gn index 117dba3ad169..a6c5f91496b3 100755 --- a/app/android/BUILD.gn +++ b/app/android/BUILD.gn @@ -1,6 +1,5 @@ import("//brave/build/config.gni") -group("chromedriver_dist_resources") {} group("symbol_dist_resources") {} group("dist_resources") {} diff --git a/app/ios/BUILD.gn b/app/ios/BUILD.gn index 1a8c6e3fbf31..d69866f97fc0 100644 --- a/app/ios/BUILD.gn +++ b/app/ios/BUILD.gn @@ -1,3 +1,2 @@ -group("chromedriver_dist_resources") {} group("symbol_dist_resources") {} group("dist_resources") {} diff --git a/app/linux/BUILD.gn b/app/linux/BUILD.gn index 225dd459515f..b1a38bbe2b06 100644 --- a/app/linux/BUILD.gn +++ b/app/linux/BUILD.gn @@ -1,42 +1,5 @@ import("//brave/build/config.gni") -group("chromedriver_dist_resources") { - deps = [ - ":strip_and_dump_chromedriver_symbols" - ] -} - -action("strip_and_dump_chromedriver_symbols") { - script = "//build/linux/dump_app_syms.py" - dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)" - dump_syms_binary = - get_label_info(dump_syms_label, "root_out_dir") + "/" + "dump_syms" - - chromedriver_binary = "$brave_dist_dir/chromedriver" - if (current_cpu == "x86") { - # Use "ia32" instead of "x86" for GYP compat. - chromedriver_symbol_file = "$root_out_dir/chromedriver.breakpad.ia32" - } else { - chromedriver_symbol_file = "$root_out_dir/chromedriver.breakpad.$current_cpu" - } - - inputs = [ chromedriver_binary, dump_syms_binary ] - outputs = [ chromedriver_symbol_file ] - - args = [ - "./" + rebase_path(dump_syms_binary, root_build_dir), - "1", # strip_binary = true - rebase_path(chromedriver_binary, root_build_dir), - rebase_path(chromedriver_symbol_file, root_build_dir), - ] - - deps = [ - dump_syms_label, - "//brave:brave_chromedriver_dist_resources", - ] -} - - action("generate_breakpad_symbols") { symbols_dir = "$brave_dist_dir/$brave_project_name.breakpad.syms" outputs = [ diff --git a/app/mac/BUILD.gn b/app/mac/BUILD.gn index f2efbf376b76..ec50764b3cf7 100644 --- a/app/mac/BUILD.gn +++ b/app/mac/BUILD.gn @@ -3,8 +3,6 @@ import("//build/util/branding.gni") import("//build/util/version.gni") import("//chrome/common/features.gni") -group("chromedriver_dist_resources") {} - chrome_framework_name = chrome_product_full_name + " Framework" chrome_helper_name = chrome_product_full_name + " Helper" diff --git a/app/win/BUILD.gn b/app/win/BUILD.gn index 25f9f464684e..0ab39f2618b7 100644 --- a/app/win/BUILD.gn +++ b/app/win/BUILD.gn @@ -41,5 +41,3 @@ copy("dist_resources") { "//third_party/angle:copy_compiler_dll", ] } - -group("chromedriver_dist_resources") {} diff --git a/patches/chrome-test-chromedriver-BUILD.gn.patch b/patches/chrome-test-chromedriver-BUILD.gn.patch deleted file mode 100644 index d5bd87f6e69b..000000000000 --- a/patches/chrome-test-chromedriver-BUILD.gn.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/test/chromedriver/BUILD.gn b/chrome/test/chromedriver/BUILD.gn -index ab46b4e2de94f567e2f010f6badae325db24ac61..0929168b9f17b4aa2bdd6e721bf71af8909d90d0 100644 ---- a/chrome/test/chromedriver/BUILD.gn -+++ b/chrome/test/chromedriver/BUILD.gn -@@ -304,7 +304,7 @@ source_set("lib") { - } - - executable("chromedriver") { -- testonly = true -+# testonly = true - sources = [ - "server/chromedriver_server.cc", - ] diff --git a/patches/net-traffic_annotation-BUILD.gn.patch b/patches/net-traffic_annotation-BUILD.gn.patch deleted file mode 100644 index 41896765b745..000000000000 --- a/patches/net-traffic_annotation-BUILD.gn.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/net/traffic_annotation/BUILD.gn b/net/traffic_annotation/BUILD.gn -index 771970a0462592317bcc061c7763eb55e67458df..66e73e69e4cf1e79ece8f49f59ad0c30f87647b2 100644 ---- a/net/traffic_annotation/BUILD.gn -+++ b/net/traffic_annotation/BUILD.gn -@@ -8,7 +8,7 @@ source_set("traffic_annotation") { - } - - source_set("test_support") { -- testonly = true -+# testonly = true - sources = [ - "network_traffic_annotation_test_helper.h", - ] diff --git a/script/lib/config.py b/script/lib/config.py index 76bfbc051ac2..2a3e18974df8 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -109,22 +109,6 @@ def get_target_arch(): else 'x64') -def get_chromedriver_version(): - pattern = "^[ ]*chromedriver_version = \"([0-9][.][0-9]+)\"" - build_gn_path = os.path.join(BRAVE_CORE_ROOT, 'BUILD.gn') - with open(build_gn_path, 'r') as build_gn_file: - for line in build_gn_file: - match = re.search(pattern, line) - if match: - version = match.group(1) - try: - version - except NameError: - raise(NameError("chromedriver_version Not Found")) - - return 'v' + version - - def get_env_var(name): return (os.environ.get('BRAVE_' + name) or os.environ.get('npm_config_BRAVE_' + name, '')) diff --git a/script/publish_release.py b/script/publish_release.py index 722627e207fc..ec69fe7d176e 100755 --- a/script/publish_release.py +++ b/script/publish_release.py @@ -10,7 +10,7 @@ import sys from lib.github import GitHub from lib.config import (PLATFORM, DIST_URL, get_target_arch, - get_chromedriver_version, get_env_var, + get_env_var, s3_config, get_zip_name, product_name, project_name, SOURCE_ROOT, dist_dir, output_dir, get_brave_version, diff --git a/script/test/test_config.py b/script/test/test_config.py deleted file mode 100644 index 221e912d4617..000000000000 --- a/script/test/test_config.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. - -import os -import re -import sys -import unittest - -from lib.config import * -from mock import call, MagicMock - -dirname = os.path.dirname(os.path.realpath(__file__)) -sys.path.append(os.path.join(dirname, '..')) - - -class TestConfig(unittest.TestCase): - - def test_get_chromedriver_version(self): - pattern = "v[0-9][.][0-9]+" - m = re.match(pattern, get_chromedriver_version()) - self.assertTrue(m) - - -if __name__ == '__main__': - print unittest.main() diff --git a/script/upload.py b/script/upload.py index 20d338fe929b..d32cdb1b3c4c 100755 --- a/script/upload.py +++ b/script/upload.py @@ -16,7 +16,7 @@ import tempfile from lib.config import (PLATFORM, DIST_URL, get_target_arch, - get_chromedriver_version, get_env_var, s3_config, + get_env_var, s3_config, get_zip_name, product_name, project_name, SOURCE_ROOT, dist_dir, output_dir, get_brave_version, get_raw_version) @@ -68,10 +68,6 @@ def main(): # elif PLATFORM == 'win32': # upload_brave(repo, release, os.path.join(dist_dir(), PDB_NAME)) - # Upload chromedriver and mksnapshot. - chromedriver = get_zip_name('chromedriver', get_chromedriver_version()) - upload_brave(repo, release, os.path.join(dist_dir(), chromedriver), force=args.force) - pkgs = get_brave_packages(output_dir(), release_channel(), get_raw_version()) if PLATFORM == 'darwin':