Don't fetch flash when fetching android_internal. (reland)

Bug: 856278
Change-Id: I949cefd102ecc80b161d082ec40b7e059f596781
Reviewed-on: https://chromium-review.googlesource.com/c/1345050
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>

fetch_configs/android_internal.py

@@ -17,7 +17,7 @@ class AndroidInternal(config_util.Config):
     return {
       'alias': {
         'config': 'chromium',
-        'props': ['--target_os=android', '--internal=1'],
+        'props': ['--target_os=android', '--internal=True', '--flash=False'],
       },
     }
 

fetch_configs/chromium.py

@@ -2,6 +2,7 @@
 # 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
@@ -23,11 +24,20 @@ class Chromium(config_util.Config):
     }
     if props.get('webkit_revision', '') == 'ToT':
       solution['custom_vars']['webkit_revision'] = ''
-    if bool(props.get('internal', False)):
+    if ast.literal_eval(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', 'False')):
+        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],
     }