From d0499e03c209ce7a179a2ba453742eca9da8ede6 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Wed, 14 May 2014 20:31:16 +0000 Subject: [PATCH] Move usb_ids.py script into device/usb. It seems to be nicer to have it contained in device/usb directory as it is related to it and nice to have fewer random directories under //tools. BUG=None TEST=ninja -C out/Debug device_usb (or just usb in GN). R=keybuk@chromium.org, bryeung@chromium.org Review URL: https://codereview.chromium.org/279383004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270469 0039d316-1c4b-4281-b951-d872f2087c98 --- device/usb/BUILD.gn | 2 +- {tools/usb_ids => device/usb/tools}/usb_ids.py | 0 device/usb/usb.gyp | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename {tools/usb_ids => device/usb/tools}/usb_ids.py (100%) diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn index e3427b297934..7fcf39d6c6f8 100644 --- a/device/usb/BUILD.gn +++ b/device/usb/BUILD.gn @@ -19,7 +19,7 @@ static_library("usb") { } action("usb_device_ids") { - script = "//tools/usb_ids/usb_ids.py" + script = "//device/usb/tools/usb_ids.py" source_prereqs = [ source_ids ] outputs = [ generated_ids ] args = [ diff --git a/tools/usb_ids/usb_ids.py b/device/usb/tools/usb_ids.py similarity index 100% rename from tools/usb_ids/usb_ids.py rename to device/usb/tools/usb_ids.py diff --git a/device/usb/usb.gyp b/device/usb/usb.gyp index b7cae895b0c4..47cf824593f8 100644 --- a/device/usb/usb.gyp +++ b/device/usb/usb.gyp @@ -21,8 +21,8 @@ { 'action_name': 'generate_usb_ids', 'variables': { - 'usb_ids_path%': '<(DEPTH)/third_party/usb_ids/usb.ids', - 'usb_ids_py_path': '<(DEPTH)/tools/usb_ids/usb_ids.py', + 'usb_ids_path%': '../../third_party/usb_ids/usb.ids', + 'usb_ids_py_path': 'tools/usb_ids.py', }, 'inputs': [ '<(usb_ids_path)',