Rename tools-webrtc -> tools_webrtc

This aligns with established naming convention for all
other directories.

BUG=webrtc:7593
NOTRY=True
NOTREECHECKS=True
R=ehmaldonado@webrtc.org, mbonadei@webrtc.org
TBR=henrika@webrtc.org

Review-Url: https://codereview.webrtc.org/2864213004 .
Cr-Commit-Position: refs/heads/master@{#18059}
This commit is contained in:
Henrik Kjellander
2017-05-09 08:30:10 +02:00
parent 858b8504ae
commit 90fd7d84fd
291 changed files with 68 additions and 462 deletions

22
.gitignore vendored
View File

@ -46,16 +46,16 @@
/testing /testing
/third_party /third_party
/tools /tools
/tools-webrtc/android/profiling/flamegraph /tools_webrtc/android/profiling/flamegraph
/tools-webrtc/android/profiling/simpleperf /tools_webrtc/android/profiling/simpleperf
/tools-webrtc/audio_quality/linux/pesq /tools_webrtc/audio_quality/linux/pesq
/tools-webrtc/audio_quality/mac/pesq /tools_webrtc/audio_quality/mac/pesq
/tools-webrtc/audio_quality/win/*.exe /tools_webrtc/audio_quality/win/*.exe
/tools-webrtc/video_quality_toolchain/linux/ffmpeg /tools_webrtc/video_quality_toolchain/linux/ffmpeg
/tools-webrtc/video_quality_toolchain/linux/zxing /tools_webrtc/video_quality_toolchain/linux/zxing
/tools-webrtc/video_quality_toolchain/mac/ffmpeg /tools_webrtc/video_quality_toolchain/mac/ffmpeg
/tools-webrtc/video_quality_toolchain/mac/zxing /tools_webrtc/video_quality_toolchain/mac/zxing
/tools-webrtc/video_quality_toolchain/win/*.dll /tools_webrtc/video_quality_toolchain/win/*.dll
/tools-webrtc/video_quality_toolchain/win/*.exe /tools_webrtc/video_quality_toolchain/win/*.exe
/x86-generic_out/ /x86-generic_out/
/xcodebuild /xcodebuild

2
DEPS
View File

@ -165,7 +165,7 @@ hooks = [
'python', 'python',
'src/build/landmines.py', 'src/build/landmines.py',
'--landmine-scripts', '--landmine-scripts',
'src/tools-webrtc/get_landmines.py', 'src/tools_webrtc/get_landmines.py',
'--src-dir', '--src-dir',
'src', 'src',
], ],

View File

@ -15,7 +15,7 @@ import sys
# Files and directories that are *skipped* by cpplint in the presubmit script. # Files and directories that are *skipped* by cpplint in the presubmit script.
CPPLINT_BLACKLIST = [ CPPLINT_BLACKLIST = [
'tools-webrtc', 'tools_webrtc',
'webrtc/api/video_codecs/video_decoder.h', 'webrtc/api/video_codecs/video_decoder.h',
'webrtc/api/video_codecs/video_encoder.h', 'webrtc/api/video_codecs/video_encoder.h',
'webrtc/base', 'webrtc/base',
@ -332,7 +332,7 @@ def _CheckNoMixingCAndCCSources(input_api, gn_files, output_api):
def _CheckNoPackageBoundaryViolations(input_api, gn_files, output_api): def _CheckNoPackageBoundaryViolations(input_api, gn_files, output_api):
cwd = input_api.PresubmitLocalPath() cwd = input_api.PresubmitLocalPath()
script_path = os.path.join('tools-webrtc', 'check_package_boundaries.py') script_path = os.path.join('tools_webrtc', 'check_package_boundaries.py')
webrtc_path = os.path.join('webrtc') webrtc_path = os.path.join('webrtc')
command = [sys.executable, script_path, webrtc_path] command = [sys.executable, script_path, webrtc_path]
command += [gn_file.LocalPath() for gn_file in gn_files] command += [gn_file.LocalPath() for gn_file in gn_files]
@ -474,7 +474,7 @@ def _RunPythonTests(input_api, output_api):
Join('webrtc', 'tools'), Join('webrtc', 'tools'),
Join('webrtc', 'audio', 'test', 'unittests'), Join('webrtc', 'audio', 'test', 'unittests'),
] + [ ] + [
root for root, _, files in os.walk(Join('tools-webrtc')) root for root, _, files in os.walk(Join('tools_webrtc'))
if any(f.endswith('_test.py') for f in files) if any(f.endswith('_test.py') for f in files)
] ]
@ -533,8 +533,8 @@ def _CommonChecks(input_api, output_api):
r'^third_party[\\\/].*\.py$', r'^third_party[\\\/].*\.py$',
r'^tools[\\\/].*\.py$', r'^tools[\\\/].*\.py$',
# TODO(phoglund): should arguably be checked. # TODO(phoglund): should arguably be checked.
r'^tools-webrtc[\\\/]mb[\\\/].*\.py$', r'^tools_webrtc[\\\/]mb[\\\/].*\.py$',
r'^tools-webrtc[\\\/]valgrind[\\\/].*\.py$', r'^tools_webrtc[\\\/]valgrind[\\\/].*\.py$',
r'^xcodebuild.*[\\\/].*\.py$',), r'^xcodebuild.*[\\\/].*\.py$',),
pylintrc='pylintrc')) pylintrc='pylintrc'))

View File

@ -22,17 +22,17 @@ build_with_chromium = false
# Use our own suppressions files. # Use our own suppressions files.
asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc" asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc"
lsan_suppressions_file = "//tools-webrtc/sanitizers/lsan_suppressions_webrtc.cc" lsan_suppressions_file = "//tools_webrtc/sanitizers/lsan_suppressions_webrtc.cc"
tsan_suppressions_file = "//tools-webrtc/sanitizers/tsan_suppressions_webrtc.cc" tsan_suppressions_file = "//tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc"
msan_blacklist_path = msan_blacklist_path =
rebase_path("//tools-webrtc/msan/blacklist.txt", root_build_dir) rebase_path("//tools_webrtc/msan/blacklist.txt", root_build_dir)
ubsan_blacklist_path = ubsan_blacklist_path =
rebase_path("//tools-webrtc/ubsan/blacklist.txt", root_build_dir) rebase_path("//tools_webrtc/ubsan/blacklist.txt", root_build_dir)
ubsan_vptr_blacklist_path = ubsan_vptr_blacklist_path =
rebase_path("//tools-webrtc/ubsan/vptr_blacklist.txt", root_build_dir) rebase_path("//tools_webrtc/ubsan/vptr_blacklist.txt", root_build_dir)
# Android lint suppressions file # Android lint suppressions file
lint_suppressions_file = "//tools-webrtc/android/suppressions.xml" lint_suppressions_file = "//tools_webrtc/android/suppressions.xml"
# For Chromium, Android 32-bit non-component, non-clang builds hit a 4GiB size # For Chromium, Android 32-bit non-component, non-clang builds hit a 4GiB size
# limit, making them requiring symbol_level=2. WebRTC doesn't hit that problem # limit, making them requiring symbol_level=2. WebRTC doesn't hit that problem

View File

@ -1,387 +0,0 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
35CCB21D484D1895C69C8136 /* libPods-PodTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B440848658A273284BE622B2 /* libPods-PodTest.a */; };
980224E81CA2492B00295D57 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 980224E71CA2492B00295D57 /* main.m */; };
980224EB1CA2492B00295D57 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 980224EA1CA2492B00295D57 /* AppDelegate.m */; };
980224EE1CA2492B00295D57 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 980224ED1CA2492B00295D57 /* ViewController.m */; };
980224F11CA2492B00295D57 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 980224EF1CA2492B00295D57 /* Main.storyboard */; };
980224F31CA2492B00295D57 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 980224F21CA2492B00295D57 /* Assets.xcassets */; };
980224F61CA2492B00295D57 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 980224F41CA2492B00295D57 /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
958C1C282F79C7CA1502DE3B /* Pods-PodTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PodTest.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PodTest/Pods-PodTest.debug.xcconfig"; sourceTree = "<group>"; };
980224E31CA2492B00295D57 /* PodTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PodTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
980224E71CA2492B00295D57 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
980224E91CA2492B00295D57 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
980224EA1CA2492B00295D57 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
980224EC1CA2492B00295D57 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
980224ED1CA2492B00295D57 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
980224F01CA2492B00295D57 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
980224F21CA2492B00295D57 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
980224F51CA2492B00295D57 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
980224F71CA2492B00295D57 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A08398FF9AFA120A294C8B4A /* Pods-PodTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PodTest.release.xcconfig"; path = "Pods/Target Support Files/Pods-PodTest/Pods-PodTest.release.xcconfig"; sourceTree = "<group>"; };
B440848658A273284BE622B2 /* libPods-PodTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PodTest.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
980224E01CA2492B00295D57 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
35CCB21D484D1895C69C8136 /* libPods-PodTest.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
2D0689FF9D90317696844B09 /* Pods */ = {
isa = PBXGroup;
children = (
958C1C282F79C7CA1502DE3B /* Pods-PodTest.debug.xcconfig */,
A08398FF9AFA120A294C8B4A /* Pods-PodTest.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
94F704D644F27718B3DC8356 /* Frameworks */ = {
isa = PBXGroup;
children = (
B440848658A273284BE622B2 /* libPods-PodTest.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
980224DA1CA2492B00295D57 = {
isa = PBXGroup;
children = (
980224E51CA2492B00295D57 /* PodTest */,
980224E41CA2492B00295D57 /* Products */,
2D0689FF9D90317696844B09 /* Pods */,
94F704D644F27718B3DC8356 /* Frameworks */,
);
sourceTree = "<group>";
};
980224E41CA2492B00295D57 /* Products */ = {
isa = PBXGroup;
children = (
980224E31CA2492B00295D57 /* PodTest.app */,
);
name = Products;
sourceTree = "<group>";
};
980224E51CA2492B00295D57 /* PodTest */ = {
isa = PBXGroup;
children = (
980224E91CA2492B00295D57 /* AppDelegate.h */,
980224EA1CA2492B00295D57 /* AppDelegate.m */,
980224EC1CA2492B00295D57 /* ViewController.h */,
980224ED1CA2492B00295D57 /* ViewController.m */,
980224EF1CA2492B00295D57 /* Main.storyboard */,
980224F21CA2492B00295D57 /* Assets.xcassets */,
980224F41CA2492B00295D57 /* LaunchScreen.storyboard */,
980224F71CA2492B00295D57 /* Info.plist */,
980224E61CA2492B00295D57 /* Supporting Files */,
);
path = PodTest;
sourceTree = "<group>";
};
980224E61CA2492B00295D57 /* Supporting Files */ = {
isa = PBXGroup;
children = (
980224E71CA2492B00295D57 /* main.m */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
980224E21CA2492B00295D57 /* PodTest */ = {
isa = PBXNativeTarget;
buildConfigurationList = 980224FA1CA2492B00295D57 /* Build configuration list for PBXNativeTarget "PodTest" */;
buildPhases = (
1DF1B456F5E58A85BF7C31CB /* Check Pods Manifest.lock */,
980224DF1CA2492B00295D57 /* Sources */,
980224E01CA2492B00295D57 /* Frameworks */,
980224E11CA2492B00295D57 /* Resources */,
38335E508F0DC12B95F1FA81 /* Embed Pods Frameworks */,
AC997D7BBE631007E4045090 /* Copy Pods Resources */,
);
buildRules = (
);
dependencies = (
);
name = PodTest;
productName = PodTest;
productReference = 980224E31CA2492B00295D57 /* PodTest.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
980224DB1CA2492B00295D57 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0720;
ORGANIZATIONNAME = "Google Inc.";
TargetAttributes = {
980224E21CA2492B00295D57 = {
CreatedOnToolsVersion = 7.2.1;
};
};
};
buildConfigurationList = 980224DE1CA2492B00295D57 /* Build configuration list for PBXProject "PodTest" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 980224DA1CA2492B00295D57;
productRefGroup = 980224E41CA2492B00295D57 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
980224E21CA2492B00295D57 /* PodTest */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
980224E11CA2492B00295D57 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
980224F61CA2492B00295D57 /* LaunchScreen.storyboard in Resources */,
980224F31CA2492B00295D57 /* Assets.xcassets in Resources */,
980224F11CA2492B00295D57 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
1DF1B456F5E58A85BF7C31CB /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
38335E508F0DC12B95F1FA81 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PodTest/Pods-PodTest-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
AC997D7BBE631007E4045090 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PodTest/Pods-PodTest-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
980224DF1CA2492B00295D57 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
980224EE1CA2492B00295D57 /* ViewController.m in Sources */,
980224EB1CA2492B00295D57 /* AppDelegate.m in Sources */,
980224E81CA2492B00295D57 /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
980224EF1CA2492B00295D57 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
980224F01CA2492B00295D57 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
980224F41CA2492B00295D57 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
980224F51CA2492B00295D57 /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
980224F81CA2492B00295D57 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
980224F91CA2492B00295D57 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
980224FB1CA2492B00295D57 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 958C1C282F79C7CA1502DE3B /* Pods-PodTest.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = PodTest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.PodTest;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
980224FC1CA2492B00295D57 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A08398FF9AFA120A294C8B4A /* Pods-PodTest.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = PodTest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.PodTest;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
980224DE1CA2492B00295D57 /* Build configuration list for PBXProject "PodTest" */ = {
isa = XCConfigurationList;
buildConfigurations = (
980224F81CA2492B00295D57 /* Debug */,
980224F91CA2492B00295D57 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
980224FA1CA2492B00295D57 /* Build configuration list for PBXNativeTarget "PodTest" */ = {
isa = XCConfigurationList;
buildConfigurations = (
980224FB1CA2492B00295D57 /* Debug */,
980224FC1CA2492B00295D57 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 980224DB1CA2492B00295D57 /* Project object */;
}

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:PodTest.xcodeproj">
</FileRef>
</Workspace>

View File

@ -11,7 +11,7 @@
"""Script to generate libwebrtc.aar for distribution. """Script to generate libwebrtc.aar for distribution.
The script has to be run from the root src folder. The script has to be run from the root src folder.
./tools-webrtc/android/build_aar.py ./tools_webrtc/android/build_aar.py
.aar-file is just a zip-archive containing the files of the library. The file .aar-file is just a zip-archive containing the files of the library. The file
structure generated by this script looks like this: structure generated by this script looks like this:

View File

@ -26,7 +26,7 @@
# #
# Example usage: # Example usage:
# #
# > . tools-webrtc/android/profiling/perf_setup.sh out/Release # > . tools_webrtc/android/profiling/perf_setup.sh out/Release
# > perf_record 120 # > perf_record 120
# > flame_graph # > flame_graph
# > plot_flame_graph # > plot_flame_graph
@ -409,7 +409,7 @@ main() {
fi fi
ok "${APP_NAME} is installed on the device" ok "${APP_NAME} is installed on the device"
# Download simpleperf to <src>/tools-webrtc/android/profiling/simpleperf/. # Download simpleperf to <src>/tools_webrtc/android/profiling/simpleperf/.
# Cloning will only take place if the target does not already exist. # Cloning will only take place if the target does not already exist.
# The PATH variable will also be updated. # The PATH variable will also be updated.
# TODO(henrika): would it be better to use a target outside the WebRTC repo? # TODO(henrika): would it be better to use a target outside the WebRTC repo?
@ -445,7 +445,7 @@ main() {
perf_update perf_update
ok "symbol cache is updated" ok "symbol cache is updated"
# Download Flame Graph to <src>/tools-webrtc/android/profiling/flamegraph/. # Download Flame Graph to <src>/tools_webrtc/android/profiling/flamegraph/.
# Cloning will only take place if the target does not already exist. # Cloning will only take place if the target does not already exist.
# The PATH variable will also be updated. # The PATH variable will also be updated.
# TODO(henrika): would it be better to use a target outside the WebRTC repo? # TODO(henrika): would it be better to use a target outside the WebRTC repo?

View File

@ -15,9 +15,9 @@ It will run `mb gen` in a temporary directory and it is really useful to
check for different configurations. check for different configurations.
Usage: Usage:
$ python tools-webrtc/gn_check_autofix.py -m some_mater -b some_bot $ python tools_webrtc/gn_check_autofix.py -m some_mater -b some_bot
or or
$ python tools-webrtc/gn_check_autofix.py -c some_mb_config $ python tools_webrtc/gn_check_autofix.py -c some_mb_config
""" """
import os import os

View File

@ -619,7 +619,7 @@ class MetaBuildWrapper(object):
def ReadIOSBotConfig(self): def ReadIOSBotConfig(self):
if not self.args.master or not self.args.builder: if not self.args.master or not self.args.builder:
return {} return {}
path = self.PathJoin(self.src_dir, 'tools-webrtc', 'ios', path = self.PathJoin(self.src_dir, 'tools_webrtc', 'ios',
self.args.master, self.args.master,
self.args.builder.replace(' ', '_') + '.json') self.args.builder.replace(' ', '_') + '.json')
if not self.Exists(path): if not self.Exists(path):
@ -1077,7 +1077,7 @@ class MetaBuildWrapper(object):
memcheck = is_linux and 'rtc_use_memcheck=true' in vals['gn_args'] memcheck = is_linux and 'rtc_use_memcheck=true' in vals['gn_args']
memcheck_cmdline = [ memcheck_cmdline = [
'bash', 'bash',
'../../tools-webrtc/valgrind/webrtc_tests.sh', '../../tools_webrtc/valgrind/webrtc_tests.sh',
'--tool', '--tool',
'memcheck', 'memcheck',
'--target', '--target',
@ -1090,12 +1090,12 @@ class MetaBuildWrapper(object):
if not memcheck: if not memcheck:
extra_files += [ extra_files += [
'../../third_party/gtest-parallel/gtest-parallel', '../../third_party/gtest-parallel/gtest-parallel',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
] ]
sep = '\\' if self.platform == 'win32' else '/' sep = '\\' if self.platform == 'win32' else '/'
output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs' output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs'
gtest_parallel_wrapper = [ gtest_parallel_wrapper = [
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=%s' % output_dir, '--output_dir=%s' % output_dir,
'--gtest_color=no', '--gtest_color=no',
# We tell gtest-parallel to interrupt the test after 900 seconds, # We tell gtest-parallel to interrupt the test after 900 seconds,

View File

@ -246,7 +246,7 @@
# iOS # iOS
# The 'ios' config is just used for auditing. iOS bots # The 'ios' config is just used for auditing. iOS bots
# use the ios recipes and look up their GN arguments via files checked in # use the ios recipes and look up their GN arguments via files checked in
# under //tools-webrtc/ios/bots. It is an error to actually use one of these # under //tools_webrtc/ios/bots. It is an error to actually use one of these
# configs to generate the build files. # configs to generate the build files.
'ios': [ 'error'], 'ios': [ 'error'],

View File

@ -26,7 +26,7 @@ class FakeMBW(mb.MetaBuildWrapper):
# Override vars for test portability. # Override vars for test portability.
if win32: if win32:
self.src_dir = 'c:\\fake_src' self.src_dir = 'c:\\fake_src'
self.default_config = 'c:\\fake_src\\tools-webrtc\\mb\\mb_config.pyl' self.default_config = 'c:\\fake_src\\tools_webrtc\\mb\\mb_config.pyl'
self.default_isolate_map = ('c:\\fake_src\\testing\\buildbot\\' self.default_isolate_map = ('c:\\fake_src\\testing\\buildbot\\'
'gn_isolate_map.pyl') 'gn_isolate_map.pyl')
self.platform = 'win32' self.platform = 'win32'
@ -34,7 +34,7 @@ class FakeMBW(mb.MetaBuildWrapper):
self.sep = '\\' self.sep = '\\'
else: else:
self.src_dir = '/fake_src' self.src_dir = '/fake_src'
self.default_config = '/fake_src/tools-webrtc/mb/mb_config.pyl' self.default_config = '/fake_src/tools_webrtc/mb/mb_config.pyl'
self.default_isolate_map = '/fake_src/testing/buildbot/gn_isolate_map.pyl' self.default_isolate_map = '/fake_src/testing/buildbot/gn_isolate_map.pyl'
self.executable = '/usr/bin/python' self.executable = '/usr/bin/python'
self.platform = 'linux2' self.platform = 'linux2'
@ -442,12 +442,12 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, [ self.assertEqual(files, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../third_party/gtest-parallel/gtest-parallel', '../../third_party/gtest-parallel/gtest-parallel',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'base_unittests', 'base_unittests',
]) ])
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs', '--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no', '--gtest_color=no',
'--timeout=900', '--timeout=900',
@ -490,13 +490,13 @@ class UnitTest(unittest.TestCase):
'../../testing/test_env.py', '../../testing/test_env.py',
'../../testing/xvfb.py', '../../testing/xvfb.py',
'../../third_party/gtest-parallel/gtest-parallel', '../../third_party/gtest-parallel/gtest-parallel',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'base_unittests', 'base_unittests',
'some_resource_file', 'some_resource_file',
]) ])
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/xvfb.py', '../../testing/xvfb.py',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs', '--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no', '--gtest_color=no',
'--timeout=900', '--timeout=900',
@ -539,13 +539,13 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, [ self.assertEqual(files, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../third_party/gtest-parallel/gtest-parallel', '../../third_party/gtest-parallel/gtest-parallel',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'some_dependency', 'some_dependency',
'unittests.exe', 'unittests.exe',
]) ])
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}\\test_logs', '--output_dir=${ISOLATED_OUTDIR}\\test_logs',
'--gtest_color=no', '--gtest_color=no',
'--timeout=900', '--timeout=900',
@ -585,12 +585,12 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, [ self.assertEqual(files, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../third_party/gtest-parallel/gtest-parallel', '../../third_party/gtest-parallel/gtest-parallel',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'base_unittests', 'base_unittests',
]) ])
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../tools-webrtc/gtest-parallel-wrapper.py', '../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs', '--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no', '--gtest_color=no',
'--timeout=900', '--timeout=900',
@ -615,7 +615,7 @@ class UnitTest(unittest.TestCase):
'/fake_src/out/Release/base_unittests.runtime_deps': ( '/fake_src/out/Release/base_unittests.runtime_deps': (
"base_unittests\n" "base_unittests\n"
"lots_of_memcheck_dependencies\n" "lots_of_memcheck_dependencies\n"
"../../tools-webrtc/valgrind/webrtc_tests.sh\n" "../../tools_webrtc/valgrind/webrtc_tests.sh\n"
), ),
} }
mbw = self.check(['gen', '-c', 'gn_memcheck_bot', '//out/Release', mbw = self.check(['gen', '-c', 'gn_memcheck_bot', '//out/Release',
@ -631,14 +631,14 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, [ self.assertEqual(files, [
'../../testing/test_env.py', '../../testing/test_env.py',
'../../tools-webrtc/valgrind/webrtc_tests.sh', '../../tools_webrtc/valgrind/webrtc_tests.sh',
'base_unittests', 'base_unittests',
'lots_of_memcheck_dependencies', 'lots_of_memcheck_dependencies',
]) ])
self.assertEqual(command, [ self.assertEqual(command, [
'../../testing/test_env.py', '../../testing/test_env.py',
'bash', 'bash',
'../../tools-webrtc/valgrind/webrtc_tests.sh', '../../tools_webrtc/valgrind/webrtc_tests.sh',
'--tool', '--tool',
'memcheck', 'memcheck',
'--target', '--target',

Some files were not shown because too many files have changed in this diff Show More