Index: build/all.gyp |
diff --git a/build/all.gyp b/build/all.gyp |
index 849d891c95922d041a97c0d385ae7e6a4642ced6..5ced5e96a1f66413e30c69b0a1914c1ec2dc649d 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:*', |