[Chromecast] Change chromecast_branding to public

chromecast/chromecast_locales.gyp

Index: chromecast/chromecast_locales.gyp
diff --git a/chromecast/chromecast_locales.gyp b/chromecast/chromecast_locales.gyp
index 883a127ebd017bb070a046df45aea14eacb32252..93ea86d8f54e04651324f471f5ea42e1e73ebc0d 100644
--- a/chromecast/chromecast_locales.gyp
+++ b/chromecast/chromecast_locales.gyp
@@ -4,7 +4,7 @@
 
 {
   'variables': {
-    'chromecast_branding%': 'Chromium',
+    'chromecast_branding%': 'public',
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chromecast_strings',
   },
   'targets': [
@@ -30,10 +30,17 @@
         'chromecast_settings',
       ],
       'conditions': [
-        ['chromecast_branding=="Chrome"', {
+        ['chromecast_branding=="google" or chromecast_branding=="internal"', {
+          'variables': {
+            'chromecast_branding_name': 'Chrome',
+          },
           'dependencies': [
             'internal/chromecast_locales.gyp:chromecast_app_strings',
           ],
+        }, {
+          'variables': {
+            'chromecast_branding_name': 'Chromium',
+          },
         }],
       ],
       'actions': [
@@ -50,14 +57,14 @@
           },
           'inputs': [
             '<(repack_python_cmd)',
-            '<!@pymod_do_main(chromecast_repack_locales -i -b <(chromecast_branding) -g <(grit_out_dir) -x <(repack_output_dir) <(locales))'
+            '<!@pymod_do_main(chromecast_repack_locales -i -b <(chromecast_branding_name) -g <(grit_out_dir) -x <(repack_output_dir) <(locales))'

[byungchul, 2015/07/28 23:43:34]

Can we just use chromecast_branding here?

[yucliu1, 2015/07/29 00:19:21]

Yes. This needs to change chromecast_repack_locales.py.

           ],
           'outputs': [
-            '<!@pymod_do_main(chromecast_repack_locales -o -b <(chromecast_branding) -g <(grit_out_dir) -x <(repack_output_dir) <(locales))'
+            '<!@pymod_do_main(chromecast_repack_locales -o -b <(chromecast_branding_name) -g <(grit_out_dir) -x <(repack_output_dir) <(locales))'
           ],
           'action': [
             '<@(repack_locales_cmd)',
-            '-b', '<(chromecast_branding)',
+            '-b', '<(chromecast_branding_name)',
             '-g', '<(grit_out_dir)',
             '-x', '<(repack_output_dir)/.',
             '<@(locales)',