From 9713fa838364257affc9e863a4f842f044fa0c20 Mon Sep 17 00:00:00 2001
From: "jrg@chromium.org"
 <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 24 Mar 2012 03:57:36 +0000
Subject: 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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128679 0039d316-1c4b-4281-b951-d872f2087c98
---
 base/base.gyp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'base/base.gyp')

diff --git a/base/base.gyp b/base/base.gyp
index 08461d7..ee44677 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -9,6 +9,7 @@
   'includes': [
     '../build/win_precompile.gypi',
     'base.gypi',
+    'test/android/native_test.gyp'
   ],
   'targets': [
     {
@@ -153,7 +154,7 @@
     },
     {
       'target_name': 'base_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'sources': [
         # Tests.
         'android/jni_android_unittest.cc',
-- 
cgit v1.1