summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 16:38:29 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 16:38:29 +0000
commite64211bd21cfa560b1d1b49bb136e75b8d54715d (patch)
tree0697295d244af08a26963bf352f23864a6d329ed
parent37c7eab7e55f9912f4c98f7ee2cba9f8191f1656 (diff)
downloadchromium_src-e64211bd21cfa560b1d1b49bb136e75b8d54715d.zip
chromium_src-e64211bd21cfa560b1d1b49bb136e75b8d54715d.tar.gz
chromium_src-e64211bd21cfa560b1d1b49bb136e75b8d54715d.tar.bz2
Fixed unused variable(s) in the generated policy schema data.
Some static data is generated at runtime based on the list of supported policies for that build, which is used at runtime to validate the policies loaded by Chrome. Depending on the types of policies supported, some platforms may not use all of the generated data. This CL avoids generating data that isn't used, and prevents build failures due to unused variables when that happens. BUG=None Review URL: https://codereview.chromium.org/145013009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246613 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xcomponents/policy/tools/generate_policy_source.py67
1 files changed, 36 insertions, 31 deletions
diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py
index b067396..bc5d2d4 100755
--- a/components/policy/tools/generate_policy_source.py
+++ b/components/policy/tools/generate_policy_source.py
@@ -442,39 +442,44 @@ class SchemaNodesGenerator:
f.write(' { base::Value::%-18s %3d }, // %s\n' % (type, extra, comment))
f.write('};\n\n')
- f.write('const internal::PropertyNode kPropertyNodes[] = {\n'
- '// Property #Schema\n')
- for key, schema in self.property_nodes:
- key += ','
- f.write(' { %-50s %7d },\n' % (key, schema))
- f.write('};\n\n')
-
- f.write('const internal::PropertiesNode kProperties[] = {\n'
- '// Begin End Additional Properties\n')
- for node in self.properties_nodes:
- f.write(' { %5d, %5d, %5d }, // %s\n' % node)
- f.write('};\n\n')
-
- f.write('const internal::RestrictionNode kRestrictionNodes[] = {\n')
- f.write('// FIRST, SECOND\n')
- for first, second in self.restriction_nodes:
- f.write(' {{ %-8s %4s}},\n' % (first + ',', second))
- f.write('};\n\n')
-
- f.write('const int kIntegerEnumerations[] = {\n')
- for possible_values in self.int_enums:
- f.write(' %d,\n' % possible_values)
- f.write('};\n\n')
-
- f.write('const char* kStringEnumerations[] = {\n')
- for possible_values in self.string_enums:
- f.write(' %s,\n' % self.GetString(possible_values))
- f.write('};\n\n')
+ if self.property_nodes:
+ f.write('const internal::PropertyNode kPropertyNodes[] = {\n'
+ '// Property #Schema\n')
+ for key, schema in self.property_nodes:
+ key += ','
+ f.write(' { %-50s %6d },\n' % (key, schema))
+ f.write('};\n\n')
+
+ if self.properties_nodes:
+ f.write('const internal::PropertiesNode kProperties[] = {\n'
+ '// Begin End Additional Properties\n')
+ for node in self.properties_nodes:
+ f.write(' { %5d, %5d, %5d }, // %s\n' % node)
+ f.write('};\n\n')
+
+ if self.restriction_nodes:
+ f.write('const internal::RestrictionNode kRestrictionNodes[] = {\n')
+ f.write('// FIRST, SECOND\n')
+ for first, second in self.restriction_nodes:
+ f.write(' {{ %-8s %4s}},\n' % (first + ',', second))
+ f.write('};\n\n')
+
+ if self.int_enums:
+ f.write('const int kIntegerEnumerations[] = {\n')
+ for possible_values in self.int_enums:
+ f.write(' %d,\n' % possible_values)
+ f.write('};\n\n')
+
+ if self.string_enums:
+ f.write('const char* kStringEnumerations[] = {\n')
+ for possible_values in self.string_enums:
+ f.write(' %s,\n' % self.GetString(possible_values))
+ f.write('};\n\n')
f.write('const internal::SchemaData kChromeSchemaData = {\n'
- ' kSchemas,\n'
- ' kPropertyNodes,\n'
- ' kProperties,\n');
+ ' kSchemas,\n')
+ f.write(' kPropertyNodes,\n' if self.property_nodes else ' NULL,\n')
+ f.write(' kProperties,\n' if self.properties_nodes else ' NULL,\n')
f.write(' kRestrictionNodes,\n' if self.restriction_nodes else ' NULL,\n')
f.write(' kIntegerEnumerations,\n' if self.int_enums else ' NULL,\n')
f.write(' kStringEnumerations,\n' if self.string_enums else ' NULL,\n')