build/android/pylib/utils/isolator.py - Issue 1124763003: Update from https://crrev.com/327068 - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(399)

My Issues | Starred Open | Closed | All

Unified Diff: build/android/pylib/utils/isolator.py

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « build/android/pylib/utils/findbugs.py ('k') | build/android/pylib/utils/md5sum.py » ('j') | mojo/public/tools/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/utils/isolator.py

diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py

index fcbe42710a733db7fc72fd216e77263545dacbf7..90d5ca04b01aa3918cc35bc936b45f6eda053a8a 100644

--- a/build/android/pylib/utils/isolator.py

+++ b/build/android/pylib/utils/isolator.py

@@ -24,12 +24,16 @@ def DefaultPathVariables():

def DefaultConfigVariables():

+ # Note: This list must match the --config-vars in build/isolate.gypi

return {

'CONFIGURATION_NAME': constants.GetBuildType(),

'OS': 'android',

'asan': '0',

+ 'branding': 'Chromium',

'chromeos': '0',

'component': 'static_library',

+ 'enable_pepper_cdms': '0',

+ 'enable_plugins': '0',

'fastbuild': '0',

'icu_use_data_file_flag': '1',

'lsan': '0',

@@ -39,6 +43,7 @@ def DefaultConfigVariables():

'tsan': '0',

'use_custom_libcxx': '0',

'use_instrumented_libraries': '0',

+ 'use_prebuilt_instrumented_libraries': '0',

'use_openssl': '0',

'use_ozone': '0',

'use_x11': '0',

« no previous file with comments | « build/android/pylib/utils/findbugs.py ('k') | build/android/pylib/utils/md5sum.py » ('j') | mojo/public/tools/BUILD.gn » ('J')

Powered by Google App Engine

This is Rietveld 408576698