diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 18:35:49 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 18:35:49 +0000 |
| commit | 8bf6c17915c9c9c8d707c809efb7e8f76050ed27 (patch) | |
| tree | 0e6a6ffcea101401cfb266146b1473c678eb2ce6 /content/content.gyp | |
| parent | 029ed3e3b3f2cc80b8c6866a4210d7eaf3db493f (diff) | |
| download | chromium_src-8bf6c17915c9c9c8d707c809efb7e8f76050ed27.zip chromium_src-8bf6c17915c9c9c8d707c809efb7e8f76050ed27.tar.gz chromium_src-8bf6c17915c9c9c8d707c809efb7e8f76050ed27.tar.bz2 | |
Make java_aidl targets export include directories
Native code generation rules typically add their output directory to
their dependent's 'include_dirs'. This change makes targets that include
java_aidl.gypi do a similar thing for other java*.gypi targets.
Make java.gypi pass this variable to ant and content.xml use the
variable rather than hardcoding the directory.
Also, move the aidl output folder into <(SHARED_INTERMEDIATE_DIR) as it
should be.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10855060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp index fcb3e5e..41b1c02 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -230,6 +230,7 @@ 'target_name': 'common_aidl', 'type': 'none', 'variables': { + 'package_name': 'content', 'aidl_interface_file': 'public/android/java/src/org/chromium/content/common/common.aidl', }, 'sources': [ @@ -244,6 +245,7 @@ 'dependencies': [ '../base/base.gyp:base_java', '../net/net.gyp:net_java', + 'common_aidl', 'content_common', ], 'export_dependent_settings': [ |