From 9c7453daefe625d26df5c96f2766ca09f7040c54 Mon Sep 17 00:00:00 2001 From: "jrg@chromium.org" Date: Sat, 21 Jan 2012 00:45:40 +0000 Subject: Checkpoint: android fixes towards compilation of unit_tests. Dependent on clipboard.h change in https://chromiumcodereview.appspot.com/9264014 BUG=None TEST= Review URL: http://codereview.chromium.org/9226012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118567 0039d316-1c4b-4281-b951-d872f2087c98 --- build/all.gyp | 4 +++- build/all_android.gyp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build/all.gyp b/build/all.gyp index 6604f72..1bcac1ee0 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -263,7 +263,9 @@ '../chrome/chrome.gyp:chromedriver', ], 'conditions': [ - ['OS=="mac" or OS=="win" or (os_posix==1 and target_arch==python_arch)', { + # If you change this condition, make sure you also change it + # in chrome_tests.gypi + ['OS=="mac" or OS=="win" or (os_posix==1 and OS != "android" and target_arch==python_arch)', { 'dependencies': [ '../chrome/chrome.gyp:pyautolib', ], diff --git a/build/all_android.gyp b/build/all_android.gyp index 7e0d0f4..2333441 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -36,6 +36,7 @@ 'dependencies': [ '../webkit/webkit.gyp:pull_in_webkit_unit_tests', '../webkit/webkit.gyp:pull_in_DumpRenderTree', + '../chrome/chrome.gyp:unit_tests' ], }, ], # targets -- cgit v1.1