a96e2d77cb
I removed the 'libjingle' target in talk/libjingle.gyp and replaced all users of it with base/base.gyp:rtc_base. It seems the jsoncpp and expat dependencies were not used by it's previous references. The files in talk/media/testdata were uploaded to Google Storage and added .sha1 files in resources/media instead of simply moving them. The previously disabled warnings that were inherited from talk/build/common.gypi are now replaced by target-specific disabling of only the failing warnings. Additional disabling was needed since the stricter compilation warnings that applies to code in webrtc/. License headers will be updated in a follow-up CL in order to not break Git history. Other modifications: * Updated the header guards. * Sorted the includes using chromium/src/tools/sort-headers.py except for these files: talk/app/webrtc/peerconnectionendtoend_unittest.cc talk/app/webrtc/java/jni/androidmediadecoder_jni.cc talk/app/webrtc/java/jni/androidmediaencoder_jni.cc webrtc/media/devices/win32devicemanager.cc. * Unused GYP reference to libjingle_tests_additional_deps was removed. * Removed duplicated GYP entries of webrtc/base/testutils.cc webrtc/base/testutils.h The HAVE_WEBRTC_VIDEO and HAVE_WEBRTC_VOICE defines were used by only talk/media, so they were moved to the media.gyp. I also checked that none of EXPAT_RELATIVE_PATH, FEATURE_ENABLE_VOICEMAIL, GTEST_RELATIVE_PATH, JSONCPP_RELATIVE_PATH, LOGGING=1, SRTP_RELATIVE_PATH, FEATURE_ENABLE_SSL, FEATURE_ENABLE_VOICEMAIL, FEATURE_ENABLE_PSTN, HAVE_SCTP, HAVE_SRTP, are used by the talk/media code. For Chromium, the following changes will need to be applied to the roll CL that updates the DEPS for WebRTC and libjingle: https://codereview.chromium.org/1604303002/ BUG=webrtc:5420 NOPRESUBMIT=True TBR=tommi@webrtc.org Review URL: https://codereview.webrtc.org/1587193006 Cr-Commit-Position: refs/heads/master@{#11495}
101 lines
3.7 KiB
C++
101 lines
3.7 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MEDIA_BASE_EXECUTABLEHELPERS_H_
|
|
#define WEBRTC_MEDIA_BASE_EXECUTABLEHELPERS_H_
|
|
|
|
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
|
|
#include <mach-o/dyld.h>
|
|
#endif
|
|
|
|
#include <string>
|
|
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/base/pathutils.h"
|
|
|
|
namespace rtc {
|
|
|
|
// Returns the path to the running executable or an empty path.
|
|
// TODO(thorcarpenter): Consolidate with FluteClient::get_executable_dir.
|
|
inline Pathname GetExecutablePath() {
|
|
const int32_t kMaxExePathSize = 255;
|
|
#ifdef WIN32
|
|
TCHAR exe_path_buffer[kMaxExePathSize];
|
|
DWORD copied_length = GetModuleFileName(NULL, // NULL = Current process
|
|
exe_path_buffer, kMaxExePathSize);
|
|
if (0 == copied_length) {
|
|
LOG(LS_ERROR) << "Copied length is zero";
|
|
return rtc::Pathname();
|
|
}
|
|
if (kMaxExePathSize == copied_length) {
|
|
LOG(LS_ERROR) << "Buffer too small";
|
|
return rtc::Pathname();
|
|
}
|
|
#ifdef UNICODE
|
|
std::wstring wdir(exe_path_buffer);
|
|
std::string dir_tmp(wdir.begin(), wdir.end());
|
|
rtc::Pathname path(dir_tmp);
|
|
#else // UNICODE
|
|
rtc::Pathname path(exe_path_buffer);
|
|
#endif // UNICODE
|
|
#elif (defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)) || defined(WEBRTC_LINUX)
|
|
char exe_path_buffer[kMaxExePathSize];
|
|
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
|
|
uint32_t copied_length = kMaxExePathSize - 1;
|
|
if (_NSGetExecutablePath(exe_path_buffer, &copied_length) == -1) {
|
|
LOG(LS_ERROR) << "Buffer too small";
|
|
return rtc::Pathname();
|
|
}
|
|
#elif defined WEBRTC_LINUX
|
|
int32_t copied_length = kMaxExePathSize - 1;
|
|
const char* kProcExeFmt = "/proc/%d/exe";
|
|
char proc_exe_link[40];
|
|
snprintf(proc_exe_link, sizeof(proc_exe_link), kProcExeFmt, getpid());
|
|
copied_length = readlink(proc_exe_link, exe_path_buffer, copied_length);
|
|
if (copied_length == -1) {
|
|
LOG_ERR(LS_ERROR) << "Error reading link " << proc_exe_link;
|
|
return rtc::Pathname();
|
|
}
|
|
if (copied_length == kMaxExePathSize - 1) {
|
|
LOG(LS_ERROR) << "Probably truncated result when reading link "
|
|
<< proc_exe_link;
|
|
return rtc::Pathname();
|
|
}
|
|
exe_path_buffer[copied_length] = '\0';
|
|
#endif // WEBRTC_LINUX
|
|
rtc::Pathname path(exe_path_buffer);
|
|
#else // Android || iOS
|
|
rtc::Pathname path;
|
|
#endif // Mac || Linux
|
|
return path;
|
|
}
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_MEDIA_BASE_EXECUTABLEHELPERS_H_
|
|
|