Support decoding GenericNamedValue based policy.

chrome/app/policy/cloud_policy_codegen.gyp

Index: chrome/app/policy/cloud_policy_codegen.gyp
diff --git a/chrome/app/policy/cloud_policy_codegen.gyp b/chrome/app/policy/cloud_policy_codegen.gyp
index ef3bb59fcf4824c20dd89d7a78d1abc61b4879e8..3e0cfa4be051c2acd1457f8f5c1ccb9bf561f97f 100644
--- a/chrome/app/policy/cloud_policy_codegen.gyp
+++ b/chrome/app/policy/cloud_policy_codegen.gyp
@@ -78,6 +78,7 @@
           'action': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
             '--proto_path=<(policy_out_dir)/policy',
+            '--proto_path=<(proto_rel_path)',
             '<(policy_out_dir)/policy/cloud_policy.proto',
             '--cpp_out=<(protoc_out_dir)/<(proto_path_substr)',
             '--python_out=<(PRODUCT_DIR)/pyproto/device_management_pb',
@@ -88,6 +89,7 @@
       'dependencies': [
         '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
         'cloud_policy_code_generate',
+        'cloud_policy_backend_header_compile',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -102,6 +104,7 @@
         '<(proto_rel_path)/chrome_device_policy.proto',
         '<(proto_rel_path)/device_management_backend.proto',
         '<(proto_rel_path)/device_management_local.proto',
+        '<(proto_rel_path)/old_generic_format.proto',
       ],
       'rules': [
         {
@@ -117,18 +120,16 @@
           ],
           'action': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-            '--proto_path=<(policy_out_dir)/policy',
             '--proto_path=<(proto_rel_path)',
             '<(proto_rel_path)/<(RULE_INPUT_NAME)',
             '--cpp_out=<(protoc_out_dir)/<(proto_path_substr)',
             '--python_out=<(PRODUCT_DIR)/pyproto/device_management_pb',
           ],
           'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
-        }
+        },
       ],
       'dependencies': [
         '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
-        'cloud_policy_proto_compile',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -153,11 +154,14 @@
         '<(protobuf_decoder_path)',
         '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.h',
         '<(protoc_out_dir)/<(proto_path_substr)/cloud_policy.pb.cc',
+        '<(protoc_out_dir)/<(proto_path_substr)/old_generic_format.pb.h',
+        '<(protoc_out_dir)/<(proto_path_substr)/old_generic_format.pb.cc',
         '<(DEPTH)/chrome/browser/policy/policy_map.h',
         '<(DEPTH)/chrome/browser/policy/policy_map.cc',
       ],
       'include_dirs': [
         '<(DEPTH)',
+        '<(protoc_out_dir)/<(proto_path_substr)',
       ],
       'dependencies': [
         'cloud_policy_code_generate',