From d05ca1537ccd7abb2e753b2e109567e18f0df4b7 Mon Sep 17 00:00:00 2001 From: John Budorick Date: Thu, 13 Jun 2019 17:29:18 +0000 Subject: [PATCH] Invert ios_internal fetch spec. Bug: 803846 Change-Id: I8431cb0e9c7684ae9302749734bb74cc924d9f25 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1461236 Reviewed-by: Justin Cohen Reviewed-by: Dirk Pranke Reviewed-by: Aaron Gable Auto-Submit: John Budorick Commit-Queue: John Budorick --- fetch_configs/chromium.py | 6 ++++++ fetch_configs/ios_internal.py | 29 ++++++++++------------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/fetch_configs/chromium.py b/fetch_configs/chromium.py index c461aa345..b8369dc56 100644 --- a/fetch_configs/chromium.py +++ b/fetch_configs/chromium.py @@ -35,8 +35,14 @@ class Chromium(config_util.Config): solution['custom_deps'].update({ 'src/third_party/adobe/flash/binaries/ppapi/linux': None, 'src/third_party/adobe/flash/binaries/ppapi/linux_x64': None, + 'src/third_party/adobe/flash/binaries/ppapi/mac_64': None, + 'src/third_party/adobe/flash/binaries/ppapi/win': None, + 'src/third_party/adobe/flash/binaries/ppapi/win_x64': None, 'src/third_party/adobe/flash/symbols/ppapi/linux': None, 'src/third_party/adobe/flash/symbols/ppapi/linux_x64': None, + 'src/third_party/adobe/flash/symbols/ppapi/mac_64': None, + 'src/third_party/adobe/flash/symbols/ppapi/win': None, + 'src/third_party/adobe/flash/symbols/ppapi/win_x64': None, }) spec = { 'solutions': [solution], diff --git a/fetch_configs/ios_internal.py b/fetch_configs/ios_internal.py index 3adfa28b0..70607aeef 100644 --- a/fetch_configs/ios_internal.py +++ b/fetch_configs/ios_internal.py @@ -14,30 +14,21 @@ class IOSInternal(config_util.Config): @staticmethod def fetch_spec(props): - url = 'https://chrome-internal.googlesource.com/chrome/ios_internal.git' - solution = { 'name' :'src/ios_internal', - 'url' : url, - 'deps_file': 'DEPS', - 'managed' : False, - 'custom_deps': {}, - } - spec = { - 'solutions': [solution], - } - if props.get('target_os'): - spec['target_os'] = props['target_os'].split(',') - else: - spec['target_os'] = ['ios'] - if props.get('target_os_only'): - spec['target_os_only'] = props['target_os_only'] return { - 'type': 'gclient_git', - 'gclient_git_spec': spec, + 'alias': { + 'config': 'chromium', + 'props': [ + '--flash=False', + '--internal=True', + '--target_os=ios', + '--target_os_only=True', + ], + }, } @staticmethod def expected_root(_props): - return 'src' + return '' def main(argv=None):