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

tools/usb_gadget/usb_gadget.gyp

Index: tools/usb_gadget/usb_gadget.gyp
diff --git a/tools/usb_gadget.gyp b/tools/usb_gadget/usb_gadget.gyp
similarity index 47%
rename from tools/usb_gadget.gyp
rename to tools/usb_gadget/usb_gadget.gyp
index 2839b95eb9ef35ead92a7e5ac835dfdb11505e99..ed991d9d4ce1035739ba37e47dc9fb60acdefe71 100644
--- a/tools/usb_gadget.gyp
+++ b/tools/usb_gadget/usb_gadget.gyp
@@ -3,36 +3,36 @@
 # found in the LICENSE file.
 
 {
-  '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',
-    ],
-    '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',
+      'variables': {
+        'usb_gadget_files': [
+          '__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',
+      },
       '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)',