diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 18:20:22 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 18:20:22 +0000 |
| commit | 1ffa4b64ff09b60426812de232de8a21f4fb9897 (patch) | |
| tree | a5a9b122d91b89d2f24a8f4bae049defacb44937 /tools/cr | |
| parent | 5e03d1d2ff8ab8b11964654838a43fd976d1c7de (diff) | |
| download | chromium_src-1ffa4b64ff09b60426812de232de8a21f4fb9897.zip chromium_src-1ffa4b64ff09b60426812de232de8a21f4fb9897.tar.gz chromium_src-1ffa4b64ff09b60426812de232de8a21f4fb9897.tar.bz2 | |
android envsetup: Stop honoring --target-arch parameter.
Most people don't use this parameter and get arm binaries. This is
still the default, so this change shouldn't affect most people.
Folks should instead pass -Dtarget_arch to gyp. (Or, soon, envsetup will stop
clobbering GYP_DEFINES, then you can just add target_arch to your GYP_DEFINES.)
Note that in gyp land, 'mips' is called 'mipsel' and 'x86' is called 'ia32'.
'arm' stays 'arm'.
So for example, instead of running
. build/android/envsetup.sh --target-arch=mips
android_gyp
you'd run
. build/android/envsetup.sh
android_gyp -Dtarget_arch=mipsel
I updated the bots I was able to find to pass the -D flag in addition to
--target-arch. After this CL here is in, I'll update the bots to stop passing
--target-arch, and then I'll make --target-arch a hard error in this script for
a while, to make sure nobody still uses it.
BUG=330631,34476
R=torne@chromium.org
TBR=yfriedman
Review URL: https://codereview.chromium.org/171903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/cr')
| -rw-r--r-- | tools/cr/cr/base/android.py | 6 | ||||
| -rw-r--r-- | tools/cr/cr/base/arch.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/cr/cr/base/android.py b/tools/cr/cr/base/android.py index 45fdc51..7520613 100644 --- a/tools/cr/cr/base/android.py +++ b/tools/cr/cr/base/android.py @@ -59,8 +59,10 @@ class AndroidPlatform(cr.Platform): if not self._env_ready: # See what the env would be without env setup before = context.exported - # Run env setup and capture/parse it's output - envsetup = 'source {CR_ENVSETUP} --target-arch={CR_ENVSETUP_ARCH}' + before['GYP_DEFINES'] = before.get( + 'GYP_DEFINES', '') + ' target_arch={CR_ENVSETUP_ARCH}' + # Run env setup and capture/parse its output + envsetup = 'source {CR_ENVSETUP}' output = cr.Host.CaptureShell(context, envsetup + ' > /dev/null && env') env_setup = cr.Config('envsetup', literal=True, export=True) for line in output.split('\n'): diff --git a/tools/cr/cr/base/arch.py b/tools/cr/cr/base/arch.py index 743ac8e..dfc9e16 100644 --- a/tools/cr/cr/base/arch.py +++ b/tools/cr/cr/base/arch.py @@ -29,14 +29,14 @@ class Arch(cr.Plugin, cr.Plugin.Type): class IA32Arch(Arch): ACTIVE = cr.Config.From( - CR_ENVSETUP_ARCH='x86', + CR_ENVSETUP_ARCH='ia32', ) class Mips32Arch(Arch): ACTIVE = cr.Config.From( - CR_ENVSETUP_ARCH='mips', + CR_ENVSETUP_ARCH='mipsel', ) @property |