From 87a592dc50697bedd7bb7bf78fc527c349336742 Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Wed, 25 Feb 2015 03:18:23 +0000 Subject: [PATCH] Fix dependencies of media_file module and move gypi into the right dir to avoid submit warnings referencing files with '..'. TBR=kjellander@webrtc.org R=kjellander@webrtc.org BUG=4185 Review URL: https://webrtc-codereview.appspot.com/40919004 Cr-Commit-Position: refs/heads/master@{#8491} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8491 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/media_file/BUILD.gn | 9 +++---- .../media_file/{source => }/media_file.gypi | 27 +++++++------------ webrtc/modules/modules.gyp | 2 +- 3 files changed, 14 insertions(+), 24 deletions(-) rename webrtc/modules/media_file/{source => }/media_file.gypi (61%) diff --git a/webrtc/modules/media_file/BUILD.gn b/webrtc/modules/media_file/BUILD.gn index 0f97d07921..1394d67bcb 100644 --- a/webrtc/modules/media_file/BUILD.gn +++ b/webrtc/modules/media_file/BUILD.gn @@ -10,10 +10,6 @@ import("../../build/webrtc.gni") config("media_file_config") { visibility = [ ":*" ] # Only targets in this file can depend on this. - include_dirs = [ - "interface", - "../interface", - ] } source_set("media_file") { @@ -47,5 +43,8 @@ source_set("media_file") { configs -= [ "//build/config/clang:find_bad_constructs" ] } - deps = [ "../../system_wrappers" ] + deps = [ + "../../system_wrappers", + "../../common_audio", + ] } diff --git a/webrtc/modules/media_file/source/media_file.gypi b/webrtc/modules/media_file/media_file.gypi similarity index 61% rename from webrtc/modules/media_file/source/media_file.gypi rename to webrtc/modules/media_file/media_file.gypi index bce7db60be..31875b66c2 100644 --- a/webrtc/modules/media_file/source/media_file.gypi +++ b/webrtc/modules/media_file/media_file.gypi @@ -13,26 +13,17 @@ 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', ], - 'include_dirs': [ - '../interface', - '../../interface', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../interface', - '../../interface', - ], - }, 'sources': [ - '../interface/media_file.h', - '../interface/media_file_defines.h', - 'avi_file.cc', - 'avi_file.h', - 'media_file_impl.cc', - 'media_file_impl.h', - 'media_file_utility.cc', - 'media_file_utility.h', + 'interface/media_file.h', + 'interface/media_file_defines.h', + 'source/avi_file.cc', + 'source/avi_file.h', + 'source/media_file_impl.cc', + 'source/media_file_impl.h', + 'source/media_file_utility.cc', + 'source/media_file_utility.h', ], # source # TODO(jschuh): Bug 1348: fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 61d00ebf42..5b78e7a6a9 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -15,7 +15,7 @@ 'audio_processing/audio_processing.gypi', 'bitrate_controller/bitrate_controller.gypi', 'desktop_capture/desktop_capture.gypi', - 'media_file/source/media_file.gypi', + 'media_file/media_file.gypi', 'pacing/pacing.gypi', 'remote_bitrate_estimator/remote_bitrate_estimator.gypi', 'rtp_rtcp/source/rtp_rtcp.gypi',