From 1b92c824f31452251ac2cda4765ea9c947644615 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Tue, 29 May 2018 11:35:17 +0900 Subject: [PATCH] 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 --- java/sdk_library.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/sdk_library.go b/java/sdk_library.go index ba121ab6a..d649d5af2 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, ":") +