diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 23:12:06 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 23:12:06 +0000 |
| commit | 320b2046feb2d6f8ecf6d7b47cbc882dc0f93407 (patch) | |
| tree | ac18d06a412fd699a86fa964d754ec79ad449e62 /content/content.gyp | |
| parent | 20620349c6f322333a2215c5c7d59f1bbce4a390 (diff) | |
| download | chromium_src-320b2046feb2d6f8ecf6d7b47cbc882dc0f93407.zip chromium_src-320b2046feb2d6f8ecf6d7b47cbc882dc0f93407.tar.gz chromium_src-320b2046feb2d6f8ecf6d7b47cbc882dc0f93407.tar.bz2 | |
Fix Java file generation rule in java_aidl.gypi
The Java file generation rule in java_aidl.gypi assumes the wrong output path
for the generated file. This leads to spurious rebuilds.
The problem is that by default, the aidl tool outputs the Java file to
<output-path>/<package-path>/<input-file-root>.java, not to
<output-path>/<input-file-root>.java as assumed by the rule. This change fixes
the problem by explicitly specifying the output path to aidl.
Also remove superfluous path components on input files.
Review URL: https://chromiumcodereview.appspot.com/10690092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/content.gyp b/content/content.gyp index 8ce61f7..9695e7e0 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -230,11 +230,11 @@ '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', }, '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', + 'public/android/java/src/org/chromium/content/common/ISandboxedProcessService.aidl', ], 'includes': [ '../build/java_aidl.gypi' ], }, |