grit: support skipping entries in generated resource map

Bug: 899437
Change-Id: I4d6167d30a7b7014c17393960fce3ecb1470b80e
Reviewed-on: https://chromium-review.googlesource.com/c/1342778
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609526}

third_party/blink/renderer/devtools/scripts/build/generate_devtools_grd.py

@@ -54,7 +54,7 @@ kGrdTemplate = '''<?xml version="1.0" encoding="UTF-8"?>
   </outputs>
   <release seq="1">
     <includes>
-      <include name="COMPRESSED_PROTOCOL_JSON" file="${compressed_protocol_file}" use_base_dir="false" type="BINDATA" />
+      <include name="COMPRESSED_PROTOCOL_JSON" file="${compressed_protocol_file}" use_base_dir="false" type="BINDATA" skip_in_resource_map = "true"/>
     </includes>
   </release>
 </grit>

tools/grit/grit/format/resource_map_unittest.py

@@ -42,6 +42,8 @@ class FormatResourceMapUnittest(unittest.TestCase):
               <include type="foo" file="jkl" name="IDS_LANGUAGESPECIFIC" />
             </if>
             <include type="foo" file="mno" name="IDS_THIRDPRESENT" />
+            <include type="foo" file="opq" name="IDS_FOURTHPRESENT"
+                                   skip_in_resource_map="true" />
          </includes>
        </release>''', run_gatherers=True)
     output = util.StripBlankLinesAndComments(''.join(

tools/grit/grit/node/include.py

@@ -52,6 +52,7 @@ class IncludeNode(base.Node):
             'relativepath': 'false',
             'use_base_dir': 'true',
             'skip_minify': 'false',
+            'skip_in_resource_map': 'false',
            }
 
   def GetInputPath(self):
@@ -119,7 +120,8 @@ class IncludeNode(base.Node):
          allow_external_script=allow_external_script)
 
   def IsResourceMapSource(self):
-    return True
+    skip = self.attrs.get('skip_in_resource_map', 'false') == 'true'
+    return not skip
 
   @staticmethod
   def Construct(parent, name, type, file, translateable=True,

tools/grit/grit/node/include_unittest.py

@@ -79,10 +79,20 @@ class IncludeNodeUnittest(unittest.TestCase):
     compressed = inc.GetDataPackValue(lang='en', encoding=1)
 
     decompressed_data = zlib.decompress(compressed, 16 + zlib.MAX_WBITS)
-    self.assertEqual(util.ReadFile(util.PathFromRoot('grit/testdata')
-                                   + "/test_text.txt", util.BINARY),
-                     decompressed_data)
 
+  def testSkipInResourceMap(self):
+    root = util.ParseGrdForUnittest('''
+        <includes>
+          <include name="TEST1_TXT" file="test1_text.txt" type="BINDATA"/>
+          <include name="TEST2_TXT" file="test1_text.txt" type="BINDATA"
+                                    skip_in_resource_map="true"/>
+          <include name="TEST3_TXT" file="test1_text.txt" type="BINDATA"
+                                    skip_in_resource_map="false"/>
+        </includes>''', base_dir = util.PathFromRoot('grit/testdata'))
+    inc = root.GetChildrenOfType(include.IncludeNode)
+    self.assertTrue(inc[0].IsResourceMapSource())
+    self.assertFalse(inc[1].IsResourceMapSource())
+    self.assertTrue(inc[2].IsResourceMapSource())
 
 if __name__ == '__main__':
   unittest.main()