diff --git a/webrtc/api/OWNERS b/webrtc/api/OWNERS index 2a0a6aeae7..2cf27e5385 100644 --- a/webrtc/api/OWNERS +++ b/webrtc/api/OWNERS @@ -4,3 +4,8 @@ juberti@webrtc.org perkj@webrtc.org tkchin@webrtc.org tommi@webrtc.org + +# These are for the common case of adding or renaming files. If you're doing +# structural changes, please get a review from a reviewer in this file. +per-file *.gyp=* +per-file *.gypi=* diff --git a/webrtc/api/api_tests.gyp b/webrtc/api/api_tests.gyp index 65bb461474..e58fdbcb28 100644 --- a/webrtc/api/api_tests.gyp +++ b/webrtc/api/api_tests.gyp @@ -159,7 +159,7 @@ 'target_name': 'peerconnection_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):peerconnection_unittests_apk', + '<(android_tests_path):peerconnection_unittests_apk', ], }, ], @@ -171,7 +171,7 @@ 'target_name': 'peerconnection_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):peerconnection_unittests_apk', + '<(android_tests_path):peerconnection_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/android_tests.gyp similarity index 98% rename from webrtc/build/apk_tests.gyp rename to webrtc/build/android_tests.gyp index ba83acc14b..8bd2b97694 100644 --- a/webrtc/build/apk_tests.gyp +++ b/webrtc/build/android_tests.gyp @@ -7,8 +7,8 @@ # be found in the AUTHORS file in the root of the source tree. # This file exists in two versions. A no-op version under -# webrtc/build/apk_tests_noop.gyp and this one. This gyp file builds the apk -# unit tests (for Android) assuming that WebRTC is built inside a Chromium +# webrtc/build/android_tests_noop.gyp and this one. This gyp file builds the +# tests (for Android) assuming that WebRTC is built inside a Chromium # workspace. The no-op version is included when building WebRTC without # Chromium. This is a workaround for the fact that 'includes' don't expand # variables and that the relative location of apk_test.gypi is different for diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/android_tests_noop.gyp similarity index 95% rename from webrtc/build/apk_tests_noop.gyp rename to webrtc/build/android_tests_noop.gyp index bd3893e1f5..441f50750e 100644 --- a/webrtc/build/apk_tests_noop.gyp +++ b/webrtc/build/android_tests_noop.gyp @@ -6,7 +6,7 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. -# See webrtc/build/apk_tests.gyp for more information about this file. +# See webrtc/build/android_tests.gyp for more information about this file. { 'targets': [ { diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index a45c7adbcc..7eae646985 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -34,11 +34,11 @@ ['build_with_chromium==1', { 'webrtc_root%': '<(DEPTH)/third_party/webrtc', - 'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop.gyp', + 'android_tests_path%': '<(DEPTH)/third_party/webrtc/build/android_tests_noop.gyp', 'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modules_java_chromium.gyp', }, { 'webrtc_root%': '<(DEPTH)/webrtc', - 'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_tests.gyp', + 'android_tests_path%': '<(DEPTH)/webrtc/build/android_tests.gyp', 'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp', }], @@ -59,7 +59,7 @@ 'build_libevent%': '<(build_libevent)', 'enable_libevent%': '<(enable_libevent)', 'webrtc_root%': '<(webrtc_root)', - 'apk_tests_path%': '<(apk_tests_path)', + 'android_tests_path%': '<(android_tests_path)', 'modules_java_gyp_path%': '<(modules_java_gyp_path)', 'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8', 'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9', @@ -72,7 +72,7 @@ 'build_libevent%': '<(build_libevent)', 'enable_libevent%': '<(enable_libevent)', 'webrtc_root%': '<(webrtc_root)', - 'apk_tests_path%': '<(apk_tests_path)', + 'android_tests_path%': '<(android_tests_path)', 'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py', 'modules_java_gyp_path%': '<(modules_java_gyp_path)', 'webrtc_vp8_dir%': '<(webrtc_vp8_dir)', diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 30ba322dfe..c26cdcd948 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -290,7 +290,7 @@ 'target_name': 'common_audio_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):common_audio_unittests_apk', + '<(android_tests_path):common_audio_unittests_apk', ], }, ], @@ -302,7 +302,7 @@ 'target_name': 'common_audio_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):common_audio_unittests_apk', + '<(android_tests_path):common_audio_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/common_video/common_video_unittests.gyp b/webrtc/common_video/common_video_unittests.gyp index 8372c0b4a9..874a16f1ab 100644 --- a/webrtc/common_video/common_video_unittests.gyp +++ b/webrtc/common_video/common_video_unittests.gyp @@ -51,7 +51,7 @@ 'target_name': 'common_video_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):common_video_unittests_apk', + '<(android_tests_path):common_video_unittests_apk', ], }, ], @@ -63,7 +63,7 @@ 'target_name': 'common_video_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):common_video_unittests_apk', + '<(android_tests_path):common_video_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index d7476d5b98..8adb4cb06b 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -621,28 +621,28 @@ 'target_name': 'audio_codec_speed_tests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):audio_codec_speed_tests_apk', + '<(android_tests_path):audio_codec_speed_tests_apk', ], }, { 'target_name': 'audio_decoder_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):audio_decoder_unittests_apk', + '<(android_tests_path):audio_decoder_unittests_apk', ], }, { 'target_name': 'modules_tests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):modules_tests_apk', + '<(android_tests_path):modules_tests_apk', ], }, { 'target_name': 'modules_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):modules_unittests_apk', + '<(android_tests_path):modules_unittests_apk', ], }, ], @@ -654,7 +654,7 @@ 'target_name': 'audio_codec_speed_tests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):audio_codec_speed_tests_apk', + '<(android_tests_path):audio_codec_speed_tests_apk', ], 'includes': [ '../build/isolate.gypi', @@ -667,7 +667,7 @@ 'target_name': 'audio_decoder_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):audio_decoder_unittests_apk', + '<(android_tests_path):audio_decoder_unittests_apk', ], 'includes': [ '../build/isolate.gypi', @@ -680,7 +680,7 @@ 'target_name': 'modules_tests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):modules_tests_apk', + '<(android_tests_path):modules_tests_apk', ], 'includes': [ '../build/isolate.gypi', @@ -693,7 +693,7 @@ 'target_name': 'modules_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):modules_unittests_apk', + '<(android_tests_path):modules_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/system_wrappers/system_wrappers_tests.gyp b/webrtc/system_wrappers/system_wrappers_tests.gyp index 520ea4d00b..ebccba51e5 100644 --- a/webrtc/system_wrappers/system_wrappers_tests.gyp +++ b/webrtc/system_wrappers/system_wrappers_tests.gyp @@ -63,7 +63,7 @@ 'target_name': 'system_wrappers_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):system_wrappers_unittests_apk', + '<(android_tests_path):system_wrappers_unittests_apk', ], }, ], @@ -75,7 +75,7 @@ 'target_name': 'system_wrappers_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):system_wrappers_unittests_apk', + '<(android_tests_path):system_wrappers_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index ac52e59f79..28b5783cd3 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -394,7 +394,7 @@ 'target_name': 'test_support_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):test_support_unittests_apk', + '<(android_tests_path):test_support_unittests_apk', ], }, ], @@ -406,7 +406,7 @@ 'target_name': 'test_support_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):test_support_unittests_apk', + '<(android_tests_path):test_support_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp index 5a08ab99bd..977ea00a0f 100644 --- a/webrtc/tools/tools.gyp +++ b/webrtc/tools/tools.gyp @@ -185,7 +185,7 @@ 'target_name': 'tools_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):tools_unittests_apk', + '<(android_tests_path):tools_unittests_apk', ], }, ], @@ -197,7 +197,7 @@ 'target_name': 'tools_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):tools_unittests_apk', + '<(android_tests_path):tools_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index a728b1af3a..17a64b5420 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/voice_engine/voice_engine.gyp @@ -251,7 +251,7 @@ 'target_name': 'voice_engine_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):voice_engine_unittests_apk', + '<(android_tests_path):voice_engine_unittests_apk', ], }, ], @@ -263,7 +263,7 @@ 'target_name': 'voice_engine_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):voice_engine_unittests_apk', + '<(android_tests_path):voice_engine_unittests_apk', ], 'includes': [ '../build/isolate.gypi', diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 4ade4728f4..0c7dff2f5e 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -329,28 +329,28 @@ 'target_name': 'rtc_unittests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):rtc_unittests_apk', + '<(android_tests_path):rtc_unittests_apk', ], }, { 'target_name': 'video_engine_tests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):video_engine_tests_apk', + '<(android_tests_path):video_engine_tests_apk', ], }, { 'target_name': 'webrtc_perf_tests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):webrtc_perf_tests_apk', + '<(android_tests_path):webrtc_perf_tests_apk', ], }, { 'target_name': 'webrtc_nonparallel_tests_apk_target', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):webrtc_nonparallel_tests_apk', + '<(android_tests_path):webrtc_nonparallel_tests_apk', ], }, ], @@ -362,7 +362,7 @@ 'target_name': 'rtc_unittests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):rtc_unittests_apk', + '<(android_tests_path):rtc_unittests_apk', ], 'includes': [ 'build/isolate.gypi', @@ -375,7 +375,7 @@ 'target_name': 'video_engine_tests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):video_engine_tests_apk', + '<(android_tests_path):video_engine_tests_apk', ], 'includes': [ 'build/isolate.gypi', @@ -388,7 +388,7 @@ 'target_name': 'webrtc_perf_tests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):webrtc_perf_tests_apk', + '<(android_tests_path):webrtc_perf_tests_apk', ], 'includes': [ 'build/isolate.gypi', @@ -401,7 +401,7 @@ 'target_name': 'webrtc_nonparallel_tests_apk_run', 'type': 'none', 'dependencies': [ - '<(apk_tests_path):webrtc_nonparallel_tests_apk', + '<(android_tests_path):webrtc_nonparallel_tests_apk', ], 'includes': [ 'build/isolate.gypi',