Fix Android ninja sdk build

base/base.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 933 matching lines @@
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'base_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/base/BuildInfo.java',
             'android/java/src/org/chromium/base/LocaleUtils.java',
             'android/java/src/org/chromium/base/PathService.java',
             'android/java/src/org/chromium/base/PathUtils.java',
             'android/java/src/org/chromium/base/SystemMessageHandler.java',

[jar (doing other things), 2012/09/12 21:12:42]

I'm not a gyp pro... and have not played with java...

...but why isn't your change done here as well?

[cjhopman, 2012/09/12 22:09:22]

The change is needed below due to a bug in variable expansion in included gypi
files. That doesn't affect us here.

           ],
           'variables': {
             'jni_gen_dir': 'base',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
             'package_name': 'base',
-            'java_in_dir': 'android/java',
+            'java_in_dir': '../base/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'base_java_test_support',
           'type': 'none',
           'dependencies': [
             'base_java',
           ],
           'variables': {
             'package_name': 'base_javatests',
-            'java_in_dir': 'android/javatests',
+            'java_in_dir': '../base/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
     ['OS == "win"', {
       'targets': [
         {
           'target_name': 'debug_message',
           'type': 'executable',
@@ skipping 62 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'base_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }