Update scripts to use DEPS-pinned depot_tools
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:

committed by
Commit Bot

parent
033ea5f771
commit
ec57e05410
@ -47,6 +47,9 @@ LIB_TO_LICENSES_DICT = {
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.realpath(sys.argv[0]))
|
||||
CHECKOUT_ROOT = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir))
|
||||
sys.path.append(os.path.join(CHECKOUT_ROOT, 'build'))
|
||||
import find_depot_tools
|
||||
|
||||
THIRD_PARTY_LIB_REGEX = r'^.*/third_party/([\w+]+).*$'
|
||||
|
||||
class LicenseBuilder(object):
|
||||
@ -72,8 +75,15 @@ class LicenseBuilder(object):
|
||||
|
||||
@staticmethod
|
||||
def _RunGN(buildfile_dir, target):
|
||||
cmd = ['gn', 'desc', '--all', '--format=json',
|
||||
os.path.abspath(buildfile_dir), target]
|
||||
cmd = [
|
||||
sys.executable,
|
||||
os.path.join(find_depot_tools.DEPOT_TOOLS_PATH, 'gn.py'),
|
||||
'desc',
|
||||
'--all',
|
||||
'--format=json',
|
||||
os.path.abspath(buildfile_dir),
|
||||
target,
|
||||
]
|
||||
logging.debug("Running: %r", cmd)
|
||||
output_json = subprocess.check_output(cmd, cwd=CHECKOUT_ROOT)
|
||||
logging.debug("Output: %s", output_json)
|
||||
|
Reference in New Issue
Block a user