diff options
| -rw-r--r-- | build/all.gyp | 68 | ||||
| -rw-r--r-- | media/media.gyp | 26 | ||||
| -rw-r--r-- | remoting/remoting_android.gypi | 4 | ||||
| -rw-r--r-- | remoting/remoting_test.gypi | 10 |
4 files changed, 43 insertions, 65 deletions
diff --git a/build/all.gyp b/build/all.gyp index f913aa6..cb0b763 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -750,37 +750,31 @@ '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test', '../ui/events/events.gyp:events_unittests', '../ui/ui_unittests.gyp:ui_unittests', - ], - 'conditions': [ - ['"<(gtest_target_type)"=="shared_library"', { - 'dependencies': [ - # Unit test bundles packaged as an apk. - '../android_webview/android_webview.gyp:android_webview_unittests_apk', - '../base/base.gyp:base_unittests_apk', - '../cc/cc_tests.gyp:cc_unittests_apk', - '../chrome/chrome.gyp:unit_tests_apk', - '../components/components_tests.gyp:components_unittests_apk', - '../content/content_shell_and_tests.gyp:content_browsertests_apk', - '../content/content_shell_and_tests.gyp:content_gl_tests_apk', - '../content/content_shell_and_tests.gyp:content_unittests_apk', - '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk', - '../gpu/gpu.gyp:gl_tests_apk', - '../gpu/gpu.gyp:gpu_unittests_apk', - '../ipc/ipc.gyp:ipc_tests_apk', - '../media/media.gyp:media_unittests_apk', - '../net/net.gyp:net_unittests_apk', - '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', - '../sql/sql.gyp:sql_unittests_apk', - '../sync/sync.gyp:sync_unit_tests_apk', - '../ui/events/events.gyp:events_unittests_apk', - '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', - '../ui/ui_unittests.gyp:ui_unittests_apk', - '../android_webview/android_webview.gyp:android_webview_test_apk', - '../chrome/chrome.gyp:chrome_shell_test_apk', - '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', - '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk' - ], - }], + # Unit test bundles packaged as an apk. + '../android_webview/android_webview.gyp:android_webview_test_apk', + '../android_webview/android_webview.gyp:android_webview_unittests_apk', + '../base/base.gyp:base_unittests_apk', + '../cc/cc_tests.gyp:cc_unittests_apk', + '../chrome/chrome.gyp:chrome_shell_test_apk', + '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', + '../chrome/chrome.gyp:unit_tests_apk', + '../components/components_tests.gyp:components_unittests_apk', + '../content/content_shell_and_tests.gyp:content_browsertests_apk', + '../content/content_shell_and_tests.gyp:content_gl_tests_apk', + '../content/content_shell_and_tests.gyp:content_unittests_apk', + '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk', + '../gpu/gpu.gyp:gl_tests_apk', + '../gpu/gpu.gyp:gpu_unittests_apk', + '../ipc/ipc.gyp:ipc_tests_apk', + '../media/media.gyp:media_unittests_apk', + '../net/net.gyp:net_unittests_apk', + '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', + '../sql/sql.gyp:sql_unittests_apk', + '../sync/sync.gyp:sync_unit_tests_apk', + '../ui/events/events.gyp:events_unittests_apk', + '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', + '../ui/ui_unittests.gyp:ui_unittests_apk', + '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk' ], }, { @@ -794,7 +788,7 @@ 'include_tests%': 0, }, 'conditions': [ - ['"<(gtest_target_type)"=="shared_library" and include_tests==1', { + ['include_tests==1', { 'dependencies': [ '../third_party/webrtc/build/apk_tests.gyp:*', ], @@ -809,14 +803,8 @@ '../content/content_shell_and_tests.gyp:content_browsertests', '../tools/android/android_tools.gyp:android_tools', '../tools/android/android_tools.gyp:memconsumer', - ], - 'conditions': [ - ['"<(gtest_target_type)"=="shared_library"', { - 'dependencies': [ - # Unit test bundles packaged as an apk. - '../content/content_shell_and_tests.gyp:content_browsertests_apk', - ], - }], + # Unit test bundles packaged as an apk. + '../content/content_shell_and_tests.gyp:content_browsertests_apk', ], }, # target_name: android_builder_chromium_webrtc ], # targets diff --git a/media/media.gyp b/media/media.gyp index 38c871c..d96fc99 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1150,13 +1150,9 @@ 'filters/pipeline_integration_test.cc', 'filters/pipeline_integration_test_base.cc', ], - 'conditions': [ - ['gtest_target_type=="shared_library"', { - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_native_code', - 'player_android', - ], - }], + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + 'player_android', ], }], ['OS=="linux"', { @@ -1253,13 +1249,9 @@ ], }], ['OS=="android"', { - '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', + ], }], ['media_use_ffmpeg==1', { 'dependencies': [ @@ -1518,7 +1510,7 @@ 'type': 'executable', 'dependencies': [ 'media', - 'shared_memory_support', + 'shared_memory_support', '../base/base.gyp:base', '../ui/gl/gl.gyp:gl', '../ui/gfx/gfx.gyp:gfx', @@ -1549,9 +1541,7 @@ }, ], }], - # Special target to wrap a gtest_target_type==shared_library - # media_unittests into an android apk for execution. - ['OS=="android" and gtest_target_type=="shared_library"', { + ['OS=="android"', { 'targets': [ { 'target_name': 'media_unittests_apk', diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index 4fedb31..fdfc4e0 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -134,7 +134,7 @@ ], # end of 'targets' }], # 'OS=="android"' - ['OS=="android" and gtest_target_type=="shared_library"', { + ['OS=="android"', { 'targets': [ { 'target_name': 'remoting_unittests_apk', @@ -148,6 +148,6 @@ 'includes': [ '../build/apk_test.gypi' ], }, ], - }], # 'OS=="android" and gtest_target_type=="shared_library"' + }], # 'OS=="android" ], # end of 'conditions' } diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 0e8ca02..07e0efe 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -56,7 +56,7 @@ 'base/util_unittest.cc', 'client/audio_player_unittest.cc', 'client/key_event_mapper_unittest.cc', - 'client/server_log_entry_client_unittest.cc', + 'client/server_log_entry_client_unittest.cc', 'client/plugin/normalizing_input_filter_cros_unittest.cc', 'client/plugin/normalizing_input_filter_mac_unittest.cc', 'codec/audio_encoder_opus_unittest.cc', @@ -104,7 +104,7 @@ 'host/screen_capturer_fake.cc', 'host/screen_capturer_fake.h', 'host/screen_resolution_unittest.cc', - 'host/server_log_entry_host_unittest.cc', + 'host/server_log_entry_host_unittest.cc', 'host/setup/me2me_native_messaging_host.cc', 'host/setup/me2me_native_messaging_host.h', 'host/setup/me2me_native_messaging_host_unittest.cc', @@ -124,8 +124,8 @@ 'jingle_glue/mock_objects.cc', 'jingle_glue/mock_objects.h', 'jingle_glue/network_settings_unittest.cc', - 'jingle_glue/server_log_entry_unittest.cc', - 'jingle_glue/server_log_entry_unittest.h', + 'jingle_glue/server_log_entry_unittest.cc', + 'jingle_glue/server_log_entry_unittest.h', 'protocol/authenticator_test_base.cc', 'protocol/authenticator_test_base.h', 'protocol/buffered_socket_writer_unittest.cc', @@ -211,7 +211,7 @@ 'remoting_client_plugin', ], }], - [ 'OS=="android" and gtest_target_type=="shared_library"', { + [ 'OS=="android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], |