Upstream Android-specific strings.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c330c99873753c4cc342222a9e764d18474f1d67..05c608f928ca71e5eccb0ddc406a2ded53283935 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -436,7 +436,7 @@
           'use_gnome_keyring%': 1,
         }],
 
-        ['toolkit_views==0 or OS=="mac" or OS=="ios"', {
+        ['(toolkit_views==0 and OS!="android") or OS=="mac" or OS=="ios"', {

[sky, 2012/08/02 17:22:50]

Can you change the part you have in () to tookit_uses_gtk==1, eg:

'toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"'

That matches the description on 440 and is easier to grok.

[newt (away), 2012/08/02 21:55:07]

Hmm... there doesn't seem to be an easy way to use toolkit_uses_gtk since it's
not actually defined in this scope.  If I try the suggestion above, I get an
error: 

NameError: name 'toolkit_uses_gtk' is not defined while evaluating condition
'toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"'

The variable dependency chain is: grit_defines -> use_titlecase_in_grd_files ->
toolkit_uses_gtk -> use_aura, which requires more levels of nested 'variables'
sections than we have.

The easiest solution seems be to leaving the code as is, which appears to be
working so far.  Or maybe there's a gyp trick that could be used here?  Do you
have any suggestions?

[sky, 2012/08/03 16:48:52]

I'm surprised that this doesn't work since tookit_uses_gtk is defined above
this. Maybe Mark has some suggestions.

[Mark Mentovai, 2012/08/03 21:14:24]

toolkit_uses_gtk is defined in THIS variables block, inside a conditions block.
You can’t use variables defined in the same scope as yourself, you’d need to put
the definition in an inner variables scope. You can then re-export that inner
version back out. That looks like:

'variables': {
  'variables: {
    'conditions': [
      ['your_condition', {
        'toolkit_uses_gtk%': 1,
      }, {  # else
        'toolkit_uses_gtk%': 1,
      }],
    ],
  },
  'toolkit_uses_gtk': '<(toolkit_uses_gtk)',  # export this back out a level
  'conditions': [
    ['toolkit_uses_gtk==1', {  # now this works
    }],
  ],
}

Sorta like how the thing below that says “# Copy conditionally-set variables out
one scope.” works.

           # GTK+, Mac and iOS want Title Case strings
           'use_titlecase_in_grd_files%': 1,
         }],