From c05fd93177e230ad39fdca27200823cc21146c01 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Tue, 22 Jul 2014 12:36:09 +0000 Subject: [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 --- build/all.gyp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'build') 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:*', -- cgit v1.1