summaryrefslogtreecommitdiffstats
path: root/ipc/ipc.gyp
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 04:44:41 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 04:44:41 +0000
commitc691139a2747f30575b6728bfd082f1b7397d6f4 (patch)
tree92a711a68d62b69cd7e3f70a815f71c00a922537 /ipc/ipc.gyp
parent938326a8288ce244dc27ce480c285c2941a9d0c5 (diff)
downloadchromium_src-c691139a2747f30575b6728bfd082f1b7397d6f4.zip
chromium_src-c691139a2747f30575b6728bfd082f1b7397d6f4.tar.gz
chromium_src-c691139a2747f30575b6728bfd082f1b7397d6f4.tar.bz2
Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this is the only change that touched GYP files.
apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ification, and other tweaks. BUG=None TEST= Review URL: http://codereview.chromium.org/9834037 TBR=jrg@chromium.org Review URL: https://chromiumcodereview.appspot.com/9852004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc.gyp')
-rw-r--r--ipc/ipc.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 8172860..9b38f77 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
@@ -32,7 +32,7 @@
'targets': [
{
'target_name': 'ipc_tests',
- 'type': '<(gtest_target_type)',
+ 'type': 'executable',
'dependencies': [
'ipc',
'../base/base.gyp:base',