diff options
| author | iancottrell@chromium.org <iancottrell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 10:57:26 +0000 |
|---|---|---|
| committer | iancottrell@chromium.org <iancottrell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 10:57:26 +0000 |
| commit | 8582f38ed56660602b487791d72e28b97334c861 (patch) | |
| tree | 8d89ae3ec8f480668806da30b1297f57d4c62184 /tools/cr | |
| parent | 2968bc0b961bd093a9cf7a92bb26b5548ec944e4 (diff) | |
| download | chromium_src-8582f38ed56660602b487791d72e28b97334c861.zip chromium_src-8582f38ed56660602b487791d72e28b97334c861.tar.gz chromium_src-8582f38ed56660602b487791d72e28b97334c861.tar.bz2 | |
Move CHROMIUM_OUT_DIR so it is set for all platforms, not just android
BUG=
Review URL: https://codereview.chromium.org/260463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/cr')
| -rw-r--r-- | tools/cr/cr/base/android.py | 1 | ||||
| -rw-r--r-- | tools/cr/cr/base/platform.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/cr/cr/base/android.py b/tools/cr/cr/base/android.py index d876b29..6b25f58 100644 --- a/tools/cr/cr/base/android.py +++ b/tools/cr/cr/base/android.py @@ -37,7 +37,6 @@ class AndroidPlatform(cr.Platform): CR_TEST_RUNNER=os.path.join( '{CR_SRC}', 'build', 'android', 'test_runner.py'), CR_ADB_GDB=os.path.join('{CR_SRC}', 'build', 'android', 'adb_gdb'), - CHROMIUM_OUT_DIR='{CR_OUT_BASE}', CR_DEFAULT_TARGET='chrome_shell', GYP_DEF_OS='android' ) diff --git a/tools/cr/cr/base/platform.py b/tools/cr/cr/base/platform.py index 0220d9f..3126952 100644 --- a/tools/cr/cr/base/platform.py +++ b/tools/cr/cr/base/platform.py @@ -11,7 +11,7 @@ import cr DEFAULT = cr.Config.From( DEPOT_TOOLS=os.path.join('{GOOGLE_CODE}', 'depot_tools'), -) + CHROMIUM_OUT_DIR='{CR_OUT_BASE}',) class Platform(cr.Plugin, cr.Plugin.Type): |