Move classes to //components/ntp_tiles.

components/ntp_tiles.gypi

Index: components/ntp_tiles.gypi
diff --git a/components/ntp_tiles.gypi b/components/ntp_tiles.gypi
index a02ab063dcf681bfc5a13a03eb9a7b46bc8616a4..1ca9917d241cc204be253ff7195beee2c70471cc 100644
--- a/components/ntp_tiles.gypi
+++ b/components/ntp_tiles.gypi
@@ -3,23 +3,53 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      # GN version: //components/ntp_tiles
-      'target_name': 'ntp_tiles',
-      'type': 'static_library',
-      'include_dirs': [
-        '..',
+  'conditions': [
+    ['OS != "ios"', {

[blundell, 2016/06/08 11:46:32]

nit: I would just only build this in the !iOS section in components.gyp instead
of having the conditional here.

[sfiera, 2016/06/08 13:07:06]

Done.

+      'targets': [
+        {
+          # GN version: //components/ntp_tiles
+          'target_name': 'ntp_tiles',
+          'type': 'static_library',
+          'include_dirs': [
+            '..',
+          ],
+          'dependencies': [
+            '../base/base.gyp:base',
+            'history_core_browser',
+            'pref_registry',
+            'safe_json',
+            'search_engines',
+            'suggestions',
+            'variations',
+          ],
+          'sources': [
+            'ntp_tiles/most_visited_sites.cc',
+            'ntp_tiles/most_visited_sites.h',
+            'ntp_tiles/popular_sites.cc',
+            'ntp_tiles/popular_sites.h',
+            'ntp_tiles/pref_names.h',
+            'ntp_tiles/pref_names.cc',
+            'ntp_tiles/switches.h',
+            'ntp_tiles/switches.cc',
+          ],
+        },
       ],
-      'dependencies': [
-        '../base/base.gyp:base',
+    }],
+
+    ['OS == "android"', {
+      'targets': [
+        {
+          # GN: //components/ntp_tiles:ntp_tiles_enums_java
+          'target_name': 'ntp_tiles_enums_java',
+          'type': 'none',
+          'variables': {
+            'source_file': 'ntp_tiles/most_visited_sites.cc',
+          },
+          'includes': [
+            '../build/android/java_cpp_enum.gypi'
+          ],
+        },
       ],
-      'sources': [
-        'ntp_tiles/pref_names.h',
-        'ntp_tiles/pref_names.cc',
-        'ntp_tiles/switches.h',
-        'ntp_tiles/switches.cc',
-      ],
-    },
+    }],
   ],
 }