diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /build/java_aidl.gypi | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'build/java_aidl.gypi')
| -rw-r--r-- | build/java_aidl.gypi | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/build/java_aidl.gypi b/build/java_aidl.gypi index 9833256a4f..2d4ae2ef6e 100644 --- a/build/java_aidl.gypi +++ b/build/java_aidl.gypi @@ -10,8 +10,8 @@ # 'target_name': 'aidl_aidl-file-name', # 'type': 'none', # 'variables': { -# 'package_name': <name-of-package> # 'aidl_interface_file': '<interface-path>/<interface-file>.aidl', +# 'aidl_import_include': '<(DEPTH)/<path-to-src-dir>', # }, # 'sources': { # '<input-path1>/<input-file1>.aidl', @@ -27,14 +27,32 @@ # <(PRODUCT_DIR)/lib.java/<input-file2>.java # ... # +# Optional variables: +# aidl_import_include - This should be an absolute path to your java src folder +# that contains the classes that are imported by your aidl files. +# # TODO(cjhopman): dependents need to rebuild when this target's inputs have changed. { + 'variables': { + 'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/aidl', + 'aidl_import_include%': '', + 'additional_aidl_arguments': [], + 'additional_aidl_input_paths': [], + }, 'direct_dependent_settings': { 'variables': { - 'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/'], + 'generated_src_dirs': ['<(intermediate_dir)/'], }, }, + 'conditions': [ + ['"<(aidl_import_include)"!=""', { + 'variables': { + 'additional_aidl_arguments': [ '-I<(aidl_import_include)' ], + 'additional_aidl_input_paths': [ '<!@(find <(aidl_import_include) -name "*.java")', ] + } + }], + ], 'rules': [ { 'rule_name': 'compile_aidl', @@ -42,16 +60,18 @@ 'inputs': [ '<(android_sdk)/framework.aidl', '<(aidl_interface_file)', + '<@(additional_aidl_input_paths)', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java', + '<(intermediate_dir)/<(RULE_INPUT_ROOT).java', ], 'action': [ '<(android_sdk_tools)/aidl', '-p<(android_sdk)/framework.aidl', '-p<(aidl_interface_file)', + '<@(additional_aidl_arguments)', '<(RULE_INPUT_PATH)', - '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java', + '<(intermediate_dir)/<(RULE_INPUT_ROOT).java', ], }, ], |