| Index: chrome/chrome_tests_unit.gypi
|
| diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
|
| index 892d5d88fa78b581a865950960c53e2074c545be..5fad0d110c353b39bb9166001f03eaa8a91381ff 100644
|
| --- a/chrome/chrome_tests_unit.gypi
|
| +++ b/chrome/chrome_tests_unit.gypi
|
| @@ -2601,12 +2601,8 @@
|
| ['exclude', '^utility/importer/'],
|
| ['exclude', '^utility/media_galleries/'],
|
| ],
|
| - 'conditions': [
|
| - ['gtest_target_type == "shared_library"', {
|
| - 'dependencies': [
|
| - '../testing/android/native_test.gyp:native_test_native_code',
|
| - ],
|
| - }],
|
| + 'dependencies': [
|
| + '../testing/android/native_test.gyp:native_test_native_code',
|
| ],
|
| }], # OS == android
|
| ['OS!="android" and OS!="ios" and chromeos==0 and configuration_policy==1', {
|
| @@ -2781,9 +2777,7 @@
|
| ],
|
|
|
| 'conditions': [
|
| - # Special target to wrap a gtest_target_type==shared_library
|
| - # unit_tests into an android apk for execution.
|
| - ['OS == "android" and gtest_target_type == "shared_library"', {
|
| + ['OS == "android"', {
|
| 'targets': [
|
| {
|
| 'target_name': 'unit_tests_java',
|
|
|