aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorSundong Ahn <sundongahn@google.com>2018-05-29 11:35:17 +0900
committerSundong Ahn <sundongahn@google.com>2018-05-29 04:25:02 +0000
commit1b92c824f31452251ac2cda4765ea9c947644615 (patch)
treefb9da8cb823256bd7beff94bd1123d372376fd0f /java
parent4a789b1c3d0c24fe093bbc53341ae469d720fdb0 (diff)
downloadbuild_soong-1b92c824f31452251ac2cda4765ea9c947644615.tar.gz
build_soong-1b92c824f31452251ac2cda4765ea9c947644615.tar.bz2
build_soong-1b92c824f31452251ac2cda4765ea9c947644615.zip
Add aidl properties
The aidl files are allowed when creating the droiddoc module in java_sdk_library. But The properties of AIDL, local_include_dir and include_dir, are not passed to the droiddoc module. These properties are add because they are needed to generate the java files. Bug: 77575606 Test: build && java_test.go Change-Id: I1006c9ce7a5c7e424416d39fb921c27a3fa86afa
Diffstat (limited to 'java')
-rw-r--r--java/sdk_library.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go
index ba121ab6..d649d5af 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -345,6 +345,10 @@ func (module *sdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop
Current ApiToCheck
Last_released ApiToCheck
}
+ Aidl struct {
+ Include_dirs []string
+ Local_include_dirs []string
+ }
}{}
props.Name = proptools.StringPtr(module.docsName(apiScope))
@@ -353,6 +357,8 @@ func (module *sdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop
props.Custom_template = proptools.StringPtr("droiddoc-templates-sdk")
props.Installable = proptools.BoolPtr(false)
props.Libs = module.properties.Libs
+ props.Aidl.Include_dirs = module.deviceProperties.Aidl.Include_dirs
+ props.Aidl.Local_include_dirs = module.deviceProperties.Aidl.Local_include_dirs
droiddocArgs := " -hide 110 -hide 111 -hide 113 -hide 121 -hide 125 -hide 126 -hide 127 -hide 128" +
" -stubpackages " + strings.Join(module.properties.Api_packages, ":") +