diff options
author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 04:36:03 +0000 |
---|---|---|
committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 04:36:03 +0000 |
commit | 3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2 (patch) | |
tree | 218cc259dceff97f4f9552e0733cedf38802296d /sql | |
parent | 4e4e5c75d09328664f8231277eca2d4918458832 (diff) | |
download | chromium_src-3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2.zip chromium_src-3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2.tar.gz chromium_src-3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2.tar.bz2 |
Add APK targets for sql_unittests and sync_unit_tests.
BUG=125059
Follow-up to: http://codereview.chromium.org/10399126/
TEST=
Review URL: https://chromiumcodereview.appspot.com/10443068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql.gyp | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp index f16f91a..20bcf28 100644 --- a/sql/sql.gyp +++ b/sql/sql.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. @@ -30,7 +30,7 @@ }, { 'target_name': 'sql_unittests', - 'type': 'executable', + 'type': '<(gtest_target_type)', 'dependencies': [ 'sql', '../base/base.gyp:test_support_base', @@ -56,7 +56,34 @@ }], ], }], + ['OS == "android" and gtest_target_type == "shared_library"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], ], }, ], + 'conditions': [ + # Special target to wrap a gtest_target_type==shared_library + # sql_unittests into an android apk for execution. + ['OS == "android" and gtest_target_type == "shared_library"', { + 'targets': [ + { + 'target_name': 'sql_unittests_apk', + 'type': 'none', + 'dependencies': [ + '../base/base.gyp:base_java', + 'sql_unittests', + ], + 'variables': { + 'test_suite_name': 'sql_unittests', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unittests<(SHARED_LIB_SUFFIX)', + 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ], + }, + 'includes': [ '../build/apk_test.gypi' ], + }, + ], + }], + ], } |