Pass GYP DEPTH variable to isolate.
Similar change to https://codereview.chromium.org/322403003/
This will make it possible to handle different
directory levels for special builds of WebRTC, without
breaking GYP when the .isolate files are processed and
their contents is verified.
Also update all our .isolate files to use the <(DEPTH)
variable.
BUG=343106
TEST=Successful compile+test on Linux using:
ninja -C out/Release
tools/swarming_client/isolate.py run -s out/Release/tools_unittests.isolated
Also trybots passing all tests.
R=pbos@webrtc.org
TBR=tina.legrand@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/13679004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6427 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/codecs/tools/OWNERS b/webrtc/modules/audio_coding/codecs/tools/OWNERS
index 3ee6b4b..bbffda7 100644
--- a/webrtc/modules/audio_coding/codecs/tools/OWNERS
+++ b/webrtc/modules/audio_coding/codecs/tools/OWNERS
@@ -1,3 +1,4 @@
+per-file *.isolate=kjellander@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.
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate
index 82aaac0..8c5a2bd 100644
--- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate
+++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate
@@ -8,33 +8,31 @@
{
'conditions': [
['OS=="android"', {
- # When doing Android builds, the WebRTC code is put in third_party/webrtc
- # of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
- '../../../../../../resources/',
- '../../../../../../data/',
+ '<(DEPTH)/resources/',
+ '<(DEPTH)/data/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
- '../../../../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
- '../../../../../DEPS',
+ '<(DEPTH)/DEPS',
],
'isolate_dependency_tracked': [
- '../../../../../resources/audio_coding/music_stereo_48kHz.pcm',
- '../../../../../resources/audio_coding/speech_mono_16kHz.pcm',
- '../../../../../resources/audio_coding/speech_mono_32_48kHz.pcm',
- '../../../../../testing/test_env.py',
+ '<(DEPTH)/resources/audio_coding/music_stereo_48kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../../../tools/swarming_client/',
+ '<(DEPTH)/tools/swarming_client/',
],
},
}],
diff --git a/webrtc/modules/audio_device/audio_device_tests.isolate b/webrtc/modules/audio_device/audio_device_tests.isolate
index 69e877c..ebe8bfb 100644
--- a/webrtc/modules/audio_device/audio_device_tests.isolate
+++ b/webrtc/modules/audio_device/audio_device_tests.isolate
@@ -8,27 +8,25 @@
{
'conditions': [
['OS=="android"', {
- # When doing Android builds, the WebRTC code is put in third_party/webrtc
- # of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
- '../../../../data/',
- '../../../../resources/',
+ '<(DEPTH)/data/',
+ '<(DEPTH)/resources/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
- '../../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
- '../../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../tools/swarming_client/',
+ '<(DEPTH)/tools/swarming_client/',
],
},
}],
diff --git a/webrtc/modules/modules_tests.isolate b/webrtc/modules/modules_tests.isolate
index 7a051f6..e5055f0 100644
--- a/webrtc/modules/modules_tests.isolate
+++ b/webrtc/modules/modules_tests.isolate
@@ -8,32 +8,30 @@
{
'conditions': [
['OS=="android"', {
- # When doing Android builds, the WebRTC code is put in third_party/webrtc
- # of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
- '../../../data/',
- '../../../resources/',
+ '<(DEPTH)/data/',
+ '<(DEPTH)/resources/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
- '../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
- '../../DEPS',
- '../../resources/audio_coding/testfile32kHz.pcm',
- '../../resources/audio_coding/teststereo32kHz.pcm',
- '../../resources/foreman_cif.yuv',
- '../../resources/paris_qcif.yuv',
- '../../testing/test_env.py',
+ '<(DEPTH)/DEPS',
+ '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm',
+ '<(DEPTH)/resources/foreman_cif.yuv',
+ '<(DEPTH)/resources/paris_qcif.yuv',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../tools/swarming_client/',
+ '<(DEPTH)/tools/swarming_client/',
],
},
}],
diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate
index 74b713f..09ace1c 100644
--- a/webrtc/modules/modules_unittests.isolate
+++ b/webrtc/modules/modules_unittests.isolate
@@ -8,107 +8,105 @@
{
'conditions': [
['OS=="android"', {
- # When doing Android builds, the WebRTC code is put in third_party/webrtc
- # of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
- '../../../data/',
- '../../../resources/',
+ '<(DEPTH)/data/',
+ '<(DEPTH)/resources/',
],
'isolate_dependency_tracked': [
- '../../../resources/short_mixed_mono_48.dat',
- '../../../resources/short_mixed_mono_48.pcm',
- '../../../resources/short_mixed_stereo_48.dat',
- '../../../resources/short_mixed_stereo_48.pcm',
+ '<(DEPTH)/resources/short_mixed_mono_48.dat',
+ '<(DEPTH)/resources/short_mixed_mono_48.pcm',
+ '<(DEPTH)/resources/short_mixed_stereo_48.dat',
+ '<(DEPTH)/resources/short_mixed_stereo_48.pcm',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
- '../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
- '../../DEPS',
- '../../data/audio_processing/output_data_float.pb',
- '../../data/voice_engine/audio_tiny48.wav',
- '../../resources/att-downlink.rx',
- '../../resources/att-uplink.rx',
- '../../resources/audio_coding/neteq4_network_stats.dat',
- '../../resources/audio_coding/neteq4_rtcp_stats.dat',
- '../../resources/audio_coding/neteq4_universal_ref.pcm',
- '../../resources/audio_coding/neteq4_universal_ref_win_32.pcm',
- '../../resources/audio_coding/neteq4_universal_ref_win_64.pcm',
- '../../resources/audio_coding/neteq_network_stats.dat',
- '../../resources/audio_coding/neteq_rtcp_stats.dat',
- '../../resources/audio_coding/neteq_universal_new.rtp',
- '../../resources/audio_coding/neteq_universal_ref.pcm',
- '../../resources/audio_coding/testfile32kHz.pcm',
- '../../resources/deflicker_before_cif_short.yuv',
- '../../resources/far16_stereo.pcm',
- '../../resources/far32_stereo.pcm',
- '../../resources/far44_stereo.pcm',
- '../../resources/far48_stereo.pcm',
- '../../resources/far8_stereo.pcm',
- '../../resources/foremanColorEnhanced_cif_short.yuv',
- '../../resources/foreman_cif.yuv',
- '../../resources/foreman_cif_short.yuv',
- '../../resources/near16_stereo.pcm',
- '../../resources/near32_stereo.pcm',
- '../../resources/near44_stereo.pcm',
- '../../resources/near48_stereo.pcm',
- '../../resources/near8_stereo.pcm',
- '../../resources/ref03.aecdump',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin',
- '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin',
- '../../resources/short_mixed_mono_48.dat',
- '../../resources/short_mixed_mono_48.pcm',
- '../../resources/short_mixed_stereo_48.dat',
- '../../resources/short_mixed_stereo_48.pcm',
- '../../resources/sprint-downlink.rx',
- '../../resources/sprint-uplink.rx',
- '../../resources/synthetic-trace.rx',
- '../../resources/tmobile-downlink.rx',
- '../../resources/tmobile-uplink.rx',
- '../../resources/utility/encapsulated_pcm16b_8khz.wav',
- '../../resources/utility/encapsulated_pcmu_8khz.wav',
- '../../resources/verizon3g-downlink.rx',
- '../../resources/verizon3g-uplink.rx',
- '../../resources/verizon4g-downlink.rx',
- '../../resources/verizon4g-uplink.rx',
- '../../resources/video_coding/frame-ethernet-ii.pcap',
- '../../resources/video_coding/frame-loopback.pcap',
- '../../resources/video_coding/pltype103.rtp',
- '../../resources/video_coding/ssrcs-2.pcap',
- '../../resources/video_coding/ssrcs-3.pcap',
- '../../testing/test_env.py',
+ '<(DEPTH)/DEPS',
+ '<(DEPTH)/data/audio_processing/output_data_float.pb',
+ '<(DEPTH)/data/voice_engine/audio_tiny48.wav',
+ '<(DEPTH)/resources/att-downlink.rx',
+ '<(DEPTH)/resources/att-uplink.rx',
+ '<(DEPTH)/resources/audio_coding/neteq4_network_stats.dat',
+ '<(DEPTH)/resources/audio_coding/neteq4_rtcp_stats.dat',
+ '<(DEPTH)/resources/audio_coding/neteq4_universal_ref.pcm',
+ '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_32.pcm',
+ '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_64.pcm',
+ '<(DEPTH)/resources/audio_coding/neteq_network_stats.dat',
+ '<(DEPTH)/resources/audio_coding/neteq_rtcp_stats.dat',
+ '<(DEPTH)/resources/audio_coding/neteq_universal_new.rtp',
+ '<(DEPTH)/resources/audio_coding/neteq_universal_ref.pcm',
+ '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
+ '<(DEPTH)/resources/deflicker_before_cif_short.yuv',
+ '<(DEPTH)/resources/far16_stereo.pcm',
+ '<(DEPTH)/resources/far32_stereo.pcm',
+ '<(DEPTH)/resources/far44_stereo.pcm',
+ '<(DEPTH)/resources/far48_stereo.pcm',
+ '<(DEPTH)/resources/far8_stereo.pcm',
+ '<(DEPTH)/resources/foremanColorEnhanced_cif_short.yuv',
+ '<(DEPTH)/resources/foreman_cif.yuv',
+ '<(DEPTH)/resources/foreman_cif_short.yuv',
+ '<(DEPTH)/resources/near16_stereo.pcm',
+ '<(DEPTH)/resources/near32_stereo.pcm',
+ '<(DEPTH)/resources/near44_stereo.pcm',
+ '<(DEPTH)/resources/near48_stereo.pcm',
+ '<(DEPTH)/resources/near8_stereo.pcm',
+ '<(DEPTH)/resources/ref03.aecdump',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin',
+ '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin',
+ '<(DEPTH)/resources/short_mixed_mono_48.dat',
+ '<(DEPTH)/resources/short_mixed_mono_48.pcm',
+ '<(DEPTH)/resources/short_mixed_stereo_48.dat',
+ '<(DEPTH)/resources/short_mixed_stereo_48.pcm',
+ '<(DEPTH)/resources/sprint-downlink.rx',
+ '<(DEPTH)/resources/sprint-uplink.rx',
+ '<(DEPTH)/resources/synthetic-trace.rx',
+ '<(DEPTH)/resources/tmobile-downlink.rx',
+ '<(DEPTH)/resources/tmobile-uplink.rx',
+ '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav',
+ '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav',
+ '<(DEPTH)/resources/verizon3g-downlink.rx',
+ '<(DEPTH)/resources/verizon3g-uplink.rx',
+ '<(DEPTH)/resources/verizon4g-downlink.rx',
+ '<(DEPTH)/resources/verizon4g-uplink.rx',
+ '<(DEPTH)/resources/video_coding/frame-ethernet-ii.pcap',
+ '<(DEPTH)/resources/video_coding/frame-loopback.pcap',
+ '<(DEPTH)/resources/video_coding/pltype103.rtp',
+ '<(DEPTH)/resources/video_coding/ssrcs-2.pcap',
+ '<(DEPTH)/resources/video_coding/ssrcs-3.pcap',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../tools/swarming_client/',
+ '<(DEPTH)/tools/swarming_client/',
],
},
}],
diff --git a/webrtc/modules/video_capture/video_capture_tests.isolate b/webrtc/modules/video_capture/video_capture_tests.isolate
index 30374ce..57dd667 100644
--- a/webrtc/modules/video_capture/video_capture_tests.isolate
+++ b/webrtc/modules/video_capture/video_capture_tests.isolate
@@ -8,27 +8,25 @@
{
'conditions': [
['OS=="android"', {
- # When doing Android builds, the WebRTC code is put in third_party/webrtc
- # of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
- '../../../../data/',
- '../../../../resources/',
+ '<(DEPTH)/data/',
+ '<(DEPTH)/resources/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
- '../../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
- '../../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../tools/swarming_client/',
+ '<(DEPTH)/tools/swarming_client/',
],
},
}],
diff --git a/webrtc/modules/video_render/video_render_tests.isolate b/webrtc/modules/video_render/video_render_tests.isolate
index 397ec04..15c8014 100644
--- a/webrtc/modules/video_render/video_render_tests.isolate
+++ b/webrtc/modules/video_render/video_render_tests.isolate
@@ -8,27 +8,25 @@
{
'conditions': [
['OS=="android"', {
- # When doing Android builds, the WebRTC code is put in third_party/webrtc
- # of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
- '../../../../data/',
- '../../../../resources/',
+ '<(DEPTH)/data/',
+ '<(DEPTH)/resources/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
- '../../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
- '../../../testing/test_env.py',
+ '<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '../../../tools/swarming_client/',
+ '<(DEPTH)/tools/swarming_client/',
],
},
}],