summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 20:19:47 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 20:19:47 +0000
commit595b063ca05e9b4134a21fd53a08f5fe6ad9624c (patch)
treefd662dfb97b495d00acc10098827bf4b94d5de9e /base/base.gyp
parente0b32e85e0712cdd721a0c1cd283964f798489f3 (diff)
downloadchromium_src-595b063ca05e9b4134a21fd53a08f5fe6ad9624c.zip
chromium_src-595b063ca05e9b4134a21fd53a08f5fe6ad9624c.tar.gz
chromium_src-595b063ca05e9b4134a21fd53a08f5fe6ad9624c.tar.bz2
Add PathUtilsTest.
- This test invokes JNI calls and included only if gtest_target_type=shared_library. - Also set the application context to get these JNI calls working. BUG=125059 TEST= Review URL: http://codereview.chromium.org/10161032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp24
1 files changed, 15 insertions, 9 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 9126900..e048d09 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -132,6 +132,7 @@
'sources': [
# Tests.
'android/jni_android_unittest.cc',
+ 'android/path_utils_unittest.cc',
'android/scoped_java_ref_unittest.cc',
'at_exit_unittest.cc',
'atomicops_unittest.cc',
@@ -301,22 +302,27 @@
['OS == "android"', {
'sources!': [
# TODO(michaelbai): Removed the below once the fix upstreamed.
+ 'debug/stack_trace_unittest.cc',
'memory/mru_cache_unittest.cc',
'process_util_unittest.cc',
'synchronization/cancellation_flag_unittest.cc',
- # TODO(michaelbai): The below files are excluded because of the
- # missing JNI and should be added back once JNI is ready.
- 'android/jni_android_unittest.cc',
- 'android/scoped_java_ref_unittest.cc',
- 'debug/stack_trace_unittest.cc',
],
'dependencies': [
'android/jni_generator/jni_generator.gyp:jni_generator_tests',
],
- }],
- ['OS=="android" and "<(gtest_target_type)"=="shared_library"', {
- 'dependencies': [
- '../testing/android/native_test.gyp:native_test_native_code',
+ 'conditions': [
+ ['"<(gtest_target_type)"=="shared_library"', {
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }, { # gtest_target_type != shared_library
+ 'sources!': [
+ # The below files are excluded because of the missing JNI.
+ 'android/jni_android_unittest.cc',
+ 'android/path_utils_unittest.cc',
+ 'android/scoped_java_ref_unittest.cc',
+ ],
+ }],
],
}],
['use_glib==1', {