Add the missing version number comment for AndroidPolicyWriter

grit/format/policy_templates/writer_configuration.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
+
+VERSION_FILE="../chrome/VERSION"

[Joao da Silva, 2015/11/02 14:37:41]

The right way to do this would be to take the Chrome version from gyp and pass
it in the arguments when grit is invoked.

See
https://code.google.com/p/chromium/codesearch#chromium/src/components/policy....

+
 def GetConfigurationForBuild(defines):
   '''Returns a configuration dictionary for the given build that contains
   build-specific settings and information.
 
   Args:
     defines: Definitions coming from the build system.
 
   Raises:
     Exception: If 'defines' contains an unknown build-type.
   '''
@@ skipping 30 matching lines @@
       'win_mandatory_category_path': ['google', 'googlechrome'],
       'win_recommended_category_path': ['google', 'googlechrome_recommended'],
       'admx_namespace': 'Google.Policies.Chrome',
       'admx_prefix': 'chrome',
       'linux_policy_path': '/etc/opt/chrome/policies/',
     }
   else:
     raise Exception('Unknown build')
   if 'version' in defines:
     config['version'] = defines['version']
+  else:
+    version = _parseVersionFile(VERSION_FILE)

[Joao da Silva, 2015/11/02 14:37:41]

Why isn't the version found in the defines? Shouldn't the invocation of grit be
modified instead to make sure that the version is there?

+    if version:
+      config['version'] = version
   config['win_group_policy_class'] = 'Both'
   config['win_supported_os'] = 'SUPPORTED_WINXPSP2'
   if 'mac_bundle_id' in defines:
     config['mac_bundle_id'] = defines['mac_bundle_id']
   return config
+
+def _parseVersionFile(path):
+  versions = {}
+  keys = ["MAJOR", "MINOR", "BUILD", "PATCH"]
+  try:
+    version_file_content = open(path).readlines()
+    for line in version_file_content:
+      name, value = line.strip().split('=')
+      versions[name] = value
+    return ".".join([versions[key] for key in keys])
+  except IOError:
+    return None