diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 12:36:09 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 12:36:09 +0000 |
| commit | c05fd93177e230ad39fdca27200823cc21146c01 (patch) | |
| tree | 6424ed36de2dcc6ced42ce7b315dea19d60fa8ef /build | |
| parent | 8dfe0bc747b04b300fc358cf8ba79e9d34013487 (diff) | |
| download | chromium_src-c05fd93177e230ad39fdca27200823cc21146c01.zip chromium_src-c05fd93177e230ad39fdca27200823cc21146c01.tar.gz chromium_src-c05fd93177e230ad39fdca27200823cc21146c01.tar.bz2 | |
[Android] Only build relocation_packer_unittests on ARM and ARM64.
This fixes building "all" on non-ARM platforms.
TBR=ben@chromium.org
NOTRY=true
BUG=none
Review URL: https://codereview.chromium.org/404353004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 849d891..5ced5e9 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -54,12 +54,19 @@ '../chrome/chrome.gyp:chrome_shell_apk', '../remoting/remoting.gyp:remoting_apk', '../tools/telemetry/telemetry.gyp:*#host', - '../tools/relocation_packer/relocation_packer.gyp:relocation_packer_unittests#host', # TODO(nyquist) This should instead by a target for sync when all of # the sync-related code for Android has been upstreamed. # See http://crbug.com/159203 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', ], + 'conditions': [ + ['target_arch == "arm" or target_arch == "arm64"', { + 'dependencies': [ + # The relocation packer only works on ARM or ARM64. + '../tools/relocation_packer/relocation_packer.gyp:relocation_packer_unittests#host', + ], + }], + ], }, { 'dependencies': [ '../content/content_shell_and_tests.gyp:*', |