From 61e9778154390ab10658548dc19dfa400e131d8d Mon Sep 17 00:00:00 2001 From: John Budorick Date: Tue, 20 Nov 2018 22:20:25 +0000 Subject: [PATCH] Revert "Don't fetch flash when fetching android_internal." This reverts commit 3f40c42b52769f0d891e6cf8602f270b770d81f8. Reason for revert: ast.literal_eval(False) doesn't work? Original change's description: > Don't fetch flash when fetching android_internal. > > Bug: 856278 > Change-Id: I89eccc7581daedda69dee4f99d174e8cb49c6ba1 > Reviewed-on: https://chromium-review.googlesource.com/c/1342730 > Reviewed-by: Edward Lesmes > Commit-Queue: John Budorick TBR=ehmaldonado@chromium.org,jbudorick@chromium.org Change-Id: Iffb655701830984e47a2b8e7629f0ed87886a401 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 856278 Reviewed-on: https://chromium-review.googlesource.com/c/1344637 Reviewed-by: John Budorick Commit-Queue: John Budorick --- fetch_configs/android_internal.py | 2 +- fetch_configs/chromium.py | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/fetch_configs/android_internal.py b/fetch_configs/android_internal.py index 2d77532d9..f4662dbc2 100644 --- a/fetch_configs/android_internal.py +++ b/fetch_configs/android_internal.py @@ -17,7 +17,7 @@ class AndroidInternal(config_util.Config): return { 'alias': { 'config': 'chromium', - 'props': ['--target_os=android', '--internal=True', '--flash=False'], + 'props': ['--target_os=android', '--internal=1'], }, } diff --git a/fetch_configs/chromium.py b/fetch_configs/chromium.py index 994eb9308..340b2f552 100644 --- a/fetch_configs/chromium.py +++ b/fetch_configs/chromium.py @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import ast import sys import config_util # pylint: disable=import-error @@ -24,20 +23,11 @@ class Chromium(config_util.Config): } if props.get('webkit_revision', '') == 'ToT': solution['custom_vars']['webkit_revision'] = '' - if ast.literal_eval(props.get('internal', False)): + if bool(props.get('internal', False)): solution['custom_vars']['checkout_src_internal'] = True - # TODO(jbudorick): Remove this once crbug.com/803846 and # crbug.com/856278 are complete. solution['custom_vars']['checkout_mobile_internal'] = True - - if not ast.literal_eval(props.get('flash', True)): - 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/symbols/ppapi/linux': None, - 'src/third_party/adobe/flash/symbols/ppapi/linux_x64': None, - }) spec = { 'solutions': [solution], }