From e8f7dfcb412e4b51043ce5b5b10636dad03c1a40 Mon Sep 17 00:00:00 2001
From: doloffd <doloffd@amazon.com>
Date: Thu, 12 Mar 2015 15:30:41 -0700
Subject: Expose the feedback gyp target to OS="Android"

Expose to Android so that any Chromium embedder can leverage the target. This
will not affect binary size since the target is not a dependency, the only
impact it will have is it will now be included in the 'all' target for Android.

BUG=464045

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

Cr-Commit-Position: refs/heads/master@{#320393}
---
 components/components.gyp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'components/components.gyp')

diff --git a/components/components.gyp b/components/components.gyp
index 849b45f..bbf2571 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -29,6 +29,7 @@
     'error_page.gypi',
     'favicon.gypi',
     'favicon_base.gypi',
+    'feedback.gypi',
     'google.gypi',
     'handoff.gypi',
     'infobars.gypi',
@@ -88,11 +89,6 @@
         'webp_transcode.gypi',
       ],
     }],
-    ['OS != "android"', {
-      'includes': [
-        'feedback.gypi',
-      ]
-    }],
     ['OS != "ios" and OS != "android"', {
       'includes': [
         'audio_modem.gypi',
-- 
cgit v1.1