Move tools/usb_gadget.gyp to tools/usb_gadget/usb_gadget.gyp.

This placement more closely matches the GN layout.

BUG=None
R=rockot@chromium.org,tfarina@chromium.org

Review URL: https://codereview.chromium.org/526593003

Cr-Commit-Position: refs/heads/master@{#293622}

device/device_tests.gyp

@@ -16,7 +16,7 @@
         '../mojo/mojo_base.gyp:mojo_system_impl',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../tools/usb_gadget.gyp:usb_gadget',
+        '../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
         'bluetooth/bluetooth.gyp:device_bluetooth',
         'bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         'nfc/nfc.gyp:device_nfc',

tools/usb_gadget.gyp → tools/usb_gadget/usb_gadget.gyp

@@ -3,36 +3,36 @@
 # found in the LICENSE file.
 
 {
+  'targets': [
+    {
+      'target_name': 'usb_gadget',
+      'type': 'none',
       'variables': {
         'usb_gadget_files': [
-      'usb_gadget/__init__.py',
-      'usb_gadget/__main__.py',
-      'usb_gadget/default_gadget.py',
-      'usb_gadget/echo_gadget.py',
-      'usb_gadget/gadget.py',
-      'usb_gadget/hid_constants.py',
-      'usb_gadget/hid_descriptors.py',
-      'usb_gadget/hid_echo_gadget.py',
-      'usb_gadget/hid_gadget.py',
-      'usb_gadget/keyboard_gadget.py',
-      'usb_gadget/linux_gadgetfs.py',
-      'usb_gadget/mouse_gadget.py',
-      'usb_gadget/server.py',
-      'usb_gadget/usb_constants.py',
-      'usb_gadget/usb_descriptors.py',
+          '__init__.py',
+          '__main__.py',
+          'default_gadget.py',
+          'echo_gadget.py',
+          'gadget.py',
+          'hid_constants.py',
+          'hid_descriptors.py',
+          'hid_echo_gadget.py',
+          'hid_gadget.py',
+          'keyboard_gadget.py',
+          'linux_gadgetfs.py',
+          'mouse_gadget.py',
+          'server.py',
+          'usb_constants.py',
+          'usb_descriptors.py',
         ],
         'usb_gadget_package': '<(PRODUCT_DIR)/usb_gadget.zip',
         'usb_gadget_package_hash': '<(PRODUCT_DIR)/usb_gadget.zip.md5',
       },
-  'targets': [
-    {
-      'target_name': 'usb_gadget',
-      'type': 'none',
       'actions': [
         {
           'action_name': 'Building USB Gadget ZIP bundle',
           'inputs': [
-            'usb_gadget/package.py',
+            'package.py',
             '<@(usb_gadget_files)',
           ],
           'outputs': [
@@ -40,7 +40,7 @@
             '<(usb_gadget_package_hash)',
           ],
           'action': [
-            'python', 'usb_gadget/package.py',
+            'python', 'package.py',
             '--zip-file', '<(usb_gadget_package)',
             '--hash-file', '<(usb_gadget_package_hash)',
             '<@(usb_gadget_files)',