2a97317953
Recent changes in GYP seem to have broken our previous "hack" for getting the GYP rule for .isolate files imported from the Chromium build/isolate.gypi. The best solution for now is to remove the hack and check in a copy of Chromium's src/build/isolate.gypi in WebRTC's build/ dir instead. A similar approach is used for our build/protoc.gypi file. TEST=On Linux, I successfully ran: gclient runhooks ninja -C out/Release and verified a bunch of .isolated files were created in out/Release (which didn't happen before this patch). I also renamed the build/isolate.gypi from Chromium to ensure that our own is used and not that one (in case any paths would be incorrect). I also ran build/gyp_chromium in a Chromium checkout with WebRTC in third_party/webrtc having this patch applied to ensure GYP processing was still working. Finally, I verified that the same project generation and compilation from a Chromium checkout worked the way we build our Android native tests, using: . build/android/envsetup.sh GYP_DEFINES="$GYP_DEFINES include_tests=1 enable_tracing=1" gclient runhooks ninja -C out/Release android_builder_webrtc BUG=1916 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2338004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4907 4adac7df-926f-26a2-2b94-8c16560cd09d
87 lines
2.8 KiB
Python
87 lines
2.8 KiB
Python
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
{
|
|
'includes': [
|
|
'../build/common.gypi',
|
|
],
|
|
'targets': [
|
|
{
|
|
# The metrics code must be kept in its own GYP file in order to
|
|
# avoid a circular dependency error due to the dependency on libyuv.
|
|
# If the code would be put in test.gyp a circular dependency error during
|
|
# GYP generation would occur, because the libyuv.gypi unittest target
|
|
# depends on test_support_main. See issue #160 for more info.
|
|
'target_name': 'metrics',
|
|
'type': 'static_library',
|
|
'dependencies': [
|
|
'<(webrtc_root)/common_video/common_video.gyp:common_video',
|
|
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
],
|
|
'sources': [
|
|
'testsupport/metrics/video_metrics.h',
|
|
'testsupport/metrics/video_metrics.cc',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'metrics_unittests',
|
|
'type': '<(gtest_target_type)',
|
|
'dependencies': [
|
|
'metrics',
|
|
'<(webrtc_root)/test/test.gyp:test_support_main',
|
|
'<(DEPTH)/testing/gtest.gyp:gtest',
|
|
],
|
|
'sources': [
|
|
'testsupport/metrics/video_metrics_unittest.cc',
|
|
],
|
|
'conditions': [
|
|
# TODO(henrike): remove build_with_chromium==1 when the bots are
|
|
# using Chromium's buildbots.
|
|
['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
|
|
'dependencies': [
|
|
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
|
|
],
|
|
}],
|
|
],
|
|
},
|
|
], # targets
|
|
'conditions': [
|
|
# TODO(henrike): remove build_with_chromium==1 when the bots are using
|
|
# Chromium's buildbots.
|
|
['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'metrics_unittests_apk_target',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'<(apk_tests_path):metrics_unittests_apk',
|
|
],
|
|
},
|
|
],
|
|
}],
|
|
['test_isolation_mode != "noop"', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'metrics_unittests_run',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'metrics_unittests',
|
|
],
|
|
'includes': [
|
|
'../build/isolate.gypi',
|
|
'metrics_unittests.isolate',
|
|
],
|
|
'sources': [
|
|
'metrics_unittests.isolate',
|
|
],
|
|
},
|
|
],
|
|
}],
|
|
],
|
|
}
|