1 files changed, 9 insertions, 5 deletions
diff --git a/components/components.gyp b/components/components.gyp
index ef080c0..f334768b 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -23,7 +23,6 @@
     'enhanced_bookmarks.gypi',
     'favicon.gypi',
     'favicon_base.gypi',
-    'feedback.gypi',  # crbug.com/368738
     'google.gypi',
     'infobars.gypi',
     'json_schema.gypi',
@@ -55,22 +54,27 @@
         'navigation_interception.gypi',
         'plugins.gypi',
         'sessions.gypi',
-        'storage_monitor.gypi',
         'visitedlink.gypi',
         'web_contents_delegate_android.gypi',
         'web_modal.gypi',
       ],
     }],
-    ['OS == "win" or OS == "mac"', {
+    ['OS != "android"', {
       'includes': [
-        'wifi.gypi',
-      ],
+        'feedback.gypi',
+      ]
     }],
     ['OS != "ios" and OS != "android"', {
       'includes': [
+        'storage_monitor.gypi',
         'usb_service.gypi',
       ]
     }],
+    ['OS == "win" or OS == "mac"', {
+      'includes': [
+        'wifi.gypi',
+      ],
+    }],
     ['android_webview_build == 0', {
       # Android WebView fails to build if a dependency on these targets is
       # introduced.