| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index 91269004adae30c1262dcd2e5b5c2aa2fcf76f2a..e048d097fab5c9217f35f520945753ebeaa3fd77 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', {
|
|
|