Fix Java file generation rule in java_aidl.gypi

content/content.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,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
     'conditions': [
       ['inside_chromium_build==0', {
@@ skipping 212 matching lines @@
       },
      ],
     },
    ],
    ['OS == "android"', {
      'targets': [
        {
          'target_name': 'common_aidl',
          'type': 'none',
          'variables': {
-           'aidl_interface_file': '../content/public/android/java/src/org/chromium/content/common/common.aidl',
+           'aidl_interface_file': 'public/android/java/src/org/chromium/content/common/common.aidl',
+           'input_package_path': 'org/chromium/content/common',

[michaelbai, 2012/07/09 18:28:11]

It is a little weird to have input_package_path here, Could we find out the
package name in aidl file?

Did you force the source aidl files to be in the same package?

I added armand as the reviewer, as he is the original author .

[Steve Block, 2012/07/09 19:52:07]

Yes, we can get the package name from the aidl file.

I tried to do this by using a gyp command expansion to set 'outputs' for the
rule. However, I couldn't work out how to have this command use
<(RULE_INPUT_PATH) to get the name of the aidl file. I think the problem is that
<(RULE_INPUT_ROOT) isn't expanded by gyp when executing the command. I'm not
sure if this is a bug or a known limitation.

I'll continue to look into this, but it would be great to land this now with a
TODO, as it's causing lots of spurious rebuilds.

[jam, 2012/07/10 00:53:59]

I don't know much about gyp, but I'd prefer that this is checked first.

[Mark Mentovai, 2012/07/10 12:30:04]

You can’t make this work automatically without running some script at GYP time
to figure out where the aidl file’s output will be written. You could do that,
but it’d slow GYP down.

What you can do, that might be cleaner, is to have

'input_package_path': 'org/chromium/content/common',
'aidl_interface_file':
'public/android/java/src/<(input_package_path)/common.aidl'

          },
          'sources': [
-           '../content/public/android/java/src/org/chromium/content/common/ISandboxedProcessCallback.aidl',
-           '../content/public/android/java/src/org/chromium/content/common/ISandboxedProcessService.aidl',
+           'public/android/java/src/org/chromium/content/common/ISandboxedProcessCallback.aidl',

[Mark Mentovai, 2012/07/10 12:30:04]

and use  input_package_path here too? Or maybe even another variable that also
includes public/android/java/src?

+           'public/android/java/src/org/chromium/content/common/ISandboxedProcessService.aidl',
          ],
          'includes': [ '../build/java_aidl.gypi' ],
        },
        {
          'target_name': 'content_java',
          'type': 'none',
          'dependencies': [
            '../base/base.gyp:base_java',
            'content_common',
          ],
          'variables': {
            'package_name': 'content',
            'java_in_dir': '../content/public/android/java',
          },
          'includes': [ '../build/java.gypi' ],
        },
        {
          'target_name': 'content_jni_headers',
          'type': 'none',
          'includes': [ 'content_jni.gypi' ],
        },
      ],
    }],  # OS == "android"
   ],
 }