Commit 61e97781 authored by John Budorick's avatar John Budorick Committed by Commit Bot

Revert "Don't fetch flash when fetching android_internal."

This reverts commit 3f40c42b.

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 <ehmaldonado@chromium.org>
> Commit-Queue: John Budorick <jbudorick@chromium.org>

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/1344637Reviewed-by: 's avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
parent 99b0ccb4
...@@ -17,7 +17,7 @@ class AndroidInternal(config_util.Config): ...@@ -17,7 +17,7 @@ class AndroidInternal(config_util.Config):
return { return {
'alias': { 'alias': {
'config': 'chromium', 'config': 'chromium',
'props': ['--target_os=android', '--internal=True', '--flash=False'], 'props': ['--target_os=android', '--internal=1'],
}, },
} }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import ast
import sys import sys
import config_util # pylint: disable=import-error import config_util # pylint: disable=import-error
...@@ -24,20 +23,11 @@ class Chromium(config_util.Config): ...@@ -24,20 +23,11 @@ class Chromium(config_util.Config):
} }
if props.get('webkit_revision', '') == 'ToT': if props.get('webkit_revision', '') == 'ToT':
solution['custom_vars']['webkit_revision'] = '' 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 solution['custom_vars']['checkout_src_internal'] = True
# TODO(jbudorick): Remove this once crbug.com/803846 and # TODO(jbudorick): Remove this once crbug.com/803846 and
# crbug.com/856278 are complete. # crbug.com/856278 are complete.
solution['custom_vars']['checkout_mobile_internal'] = True 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 = { spec = {
'solutions': [solution], 'solutions': [solution],
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment