Reduce footprint of registry controlled domain table

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index efdeda38cf84090ce01e3a50323b938380f9cee4..9626326618ce50167ea81e57122ca31f8f6cb106 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -44,6 +44,37 @@
   ],
   'targets': [
     {
+      'target_name': 'net_derived_sources',
+      'type': 'none',
+      'sources': [
+        'base/registry_controlled_domains/effective_tld_names.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest1.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest2.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest3.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest4.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest5.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest6.gperf',
+      ],
+      'rules': [
+        {
+          'rule_name': 'dafsa',
+          'extension': 'gperf',
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT)-inc.cc',
+          ],
+          'inputs': [
+            'tools/tld_cleanup/make_dafsa.py',
+          ],
+          'action': [
+            'python',
+            'tools/tld_cleanup/make_dafsa.py',
+            '<(RULE_INPUT_PATH)',
+            '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT)-inc.cc',
+          ],
+        },
+      ],
+    },

[Ryan Sleevi, 2014/03/19 03:08:32]

Let's split this up. Ideally, I'd like to avoid using
<(SHARED_INTERMEDIATE_DIR), but I'd also like to keep test and prod data
separate.

I'm happy with a target_defaults that handles gperf and outputs the appropriate
files, and then moving the .gperf dependency into net/net_unittests, outputting
to INTERMEDIATE_DIR

[Olle Liljenzin, 2014/03/21 09:36:42]

I can't figure out how to get the right include path using INTERMEDIATE_DIR.

To get effective_tld_names-inc.cc generated before registry_controlled_domain.cc
is compiled, I still need to list effective_tld_names.gperf in a separate target
that net depends on. (Is this correct?)

I tried this:

  'target_defaults': {
    'rules': [
      {
        'rule_name': 'dafsa',
        'extension': 'gperf',
        'outputs': [
          '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)-inc.cc',
        ],
        'inputs': [
          'tools/tld_cleanup/make_dafsa.py',
        ],
        'action': [
          'python',
          'tools/tld_cleanup/make_dafsa.py',
          '<(RULE_INPUT_PATH)',
          '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)-inc.cc',
        ],
      },
    ],
  },
  'targets': [
    {
      'target_name': 'net_derived_sources',
      'type': 'none',
      'sources': [
        'base/registry_controlled_domains/effective_tld_names.gperf',
      ],
      'direct_dependent_settings': {
        'include_dirs': [
          '<(INTERMEDIATE_DIR)',
        ],
      },
    },
    ...
  ],

Now the problem is that effective_tld_names-inc.cc gets installed in
obj/net/net_derived_sources.gen, but -Iobj/net/net.gen/net is added when
compiling registry_controlled_domain.cc. I can't see how I can get
INTERMEDIATE_DIR expanded to the same value in both places.

[Ryan Sleevi, 2014/03/27 20:23:01]

No, it shouldn't be. 'actions' and 'rules' are supposed to be run before the
compilation step (because of this exact reason)

This is spelled out in
https://code.google.com/p/chromium/codesearch#chromium/src/tools/gyp/pylib/gy...
for the order of execution.

[Note that 'none' types are generally "not encouraged" in GYP. I really need to
get around to writing a GYP Style Guide/All the Ways GYP can hate you Guide]

You should be able to do
'targets': [
  {
    'target_name': 'net',
    ...
    'rules': [
       ...
    ],
    'sources': [
       ...,
       'foo.gperf',
     ],
     'include_dirs': [
        ...,
        '<(INTERMEDIATE_DIR)',
     ],
   }
]
<(INTERMEDIATE_DIR) is per-target

[Olle Liljenzin, 2014/03/28 12:51:22]

When I put the rule inside the net target, then a target for
effective_tld_names-inc.cc is added to net.ninja and it works. To avoid
duplicating the rule into both net and net_unittests, I was asked to move the
rule into target_defaults. But if I move the rule, gyp will not generate a
target for effective_tld_names-inc.cc in net.ninja and the build fails.


On 2014/03/27 20:23:01, Ryan Sleevi wrote:

+    {
       'target_name': 'net',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ -58,6 +89,7 @@
         '../third_party/zlib/zlib.gyp:zlib',
         '../url/url.gyp:url_lib',
         'net_resources',
+        'net_derived_sources',
       ],
       'sources': [
         'android/cert_verify_result_android.cc',
@@ -1650,6 +1682,9 @@
         'net',
         'net_test_support'
       ],
+      'include_dirs': [
+        '<(SHARED_INTERMEDIATE_DIR)/net',
+      ],
       'sources': [
         'android/keystore_unittest.cc',
         'android/network_change_notifier_android_unittest.cc',