zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update scripts to use DEPS-pinned depot_tools

Browse Source 
Always use gn.py in depot_tools instead of just gn.
The https://cs.chromium.org/chromium/src/build/find_depot_tools.py
is looking up the DEPS-pinned copy in third_party/depot_tools
and adds it to the path when add_depot_tools_to_path() is called.

Similar use:
 

https: //cs.chromium.org/search/?q=%22find_depot_tools.add_depot_tools_to_path()%22&sq=package:chromium&type=cs
Bug: webrtc:8393
Change-Id: I3cfa3d96b4d0f60e8099e556876bc94340b1bbb5
Reviewed-on: https://webrtc-review.googlesource.com/12540
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@google.com>
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20333}
This commit is contained in:
Henrik Kjellander
2017-10-17 21:36:01 +02:00
committed by Commit Bot
parent 033ea5f771
commit ec57e05410
9 changed files with 97 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/androidtests/gradle_project_test.py
View File

@ -60,10 +60,15 @@ def main():
project_dir = os.path.abspath(project_dir)
try:
env = os.environ.copy()
env['PATH'] = os.pathsep.join([
os.path.join(SRC_DIR, 'third_party', 'depot_tools'), env.get('PATH', '')
])
_RunCommand([GENERATE_GRADLE_SCRIPT, '--output-directory', output_dir,
'--target', '//examples:AppRTCMobile',
'--project-dir', project_dir,
'--use-gradle-process-resources', '--split-projects', '--canary'])
'--use-gradle-process-resources', '--split-projects', '--canary'],
env=env)
_RunCommand([GRADLEW_BIN, 'assembleDebug'], project_dir)
finally:
# Do not delete temporary directory if user specified it manually.

11
examples/androidtests/video_quality_loopback_test.py
View File

@ -34,6 +34,8 @@ SRC_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir))
BAD_DEVICES_JSON = os.path.join(SRC_DIR,
os.environ.get('CHROMIUM_OUT_DIR', 'out'),
'bad_devices.json')
sys.path.append(os.path.join(SRC_DIR, 'build'))
import find_depot_tools
class Error(Exception):
@ -95,8 +97,13 @@ def main():
if not build_dir_x86:
build_dir_x86 = os.path.join(temp_dir, 'LocalBuild')
_RunCommand(['gn', 'gen', build_dir_x86])
_RunCommand(['ninja', '-C', build_dir_x86, 'frame_analyzer'])
def DepotToolPath(*args):
return os.path.join(find_depot_tools.DEPOT_TOOLS_PATH, *args)
_RunCommand([sys.executable, DepotToolPath('gn.py'), 'gen', build_dir_x86])
_RunCommand([DepotToolPath('ninja'), '-C', build_dir_x86,
'frame_analyzer'])
tools_dir = os.path.join(SRC_DIR, 'tools_webrtc')
toolchain_dir = os.path.join(tools_dir, 'video_quality_toolchain')