diff options
| author | Colin Cross <ccross@android.com> | 2019-04-18 10:56:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-22 10:08:35 -0700 |
| commit | 9bdfaf059105ab75bd4ca99629ce02659fe850fd (patch) | |
| tree | 22fbda0cf84fd9bf45260b612e8a3039022f0e0c /java/droiddoc.go | |
| parent | 31174703be8d659cd5ab78fb465ac16b4e493713 (diff) | |
| download | android_build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.tar.gz android_build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.tar.bz2 android_build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.zip | |
Build framework.aidl in Soong
Move the rules to build framework.aidl into Soong, and use it
when compiling aidl files with sdk_version: "current".
Also fixes incorrectly using the aidl includes exported by the
"framework" module when the proguardRaiseDep dependency was
added.
Bug: 130798034
Test: sdk_test.go
Change-Id: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
Merged-In: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
(cherry picked from commit 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b)
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index e163617e..fd7e2a48 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -404,6 +404,7 @@ type droiddocBuilderFlags struct { sourcepathArgs string dokkaClasspathArgs string aidlFlags string + aidlDeps android.Paths doclavaStubsFlags string doclavaDocsFlags string @@ -574,26 +575,23 @@ func (j *Javadoc) genWhitelistPathPrefixes(whitelistPathPrefixes map[string]bool func (j *Javadoc) collectAidlFlags(ctx android.ModuleContext, deps deps) droiddocBuilderFlags { var flags droiddocBuilderFlags - // aidl flags. - aidlFlags := j.aidlFlags(ctx, deps.aidlPreprocess, deps.aidlIncludeDirs) - if len(aidlFlags) > 0 { - // optimization. - ctx.Variable(pctx, "aidlFlags", strings.Join(aidlFlags, " ")) - flags.aidlFlags = "$aidlFlags" - } + flags.aidlFlags, flags.aidlDeps = j.aidlFlags(ctx, deps.aidlPreprocess, deps.aidlIncludeDirs) return flags } func (j *Javadoc) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.OptionalPath, - aidlIncludeDirs android.Paths) []string { + aidlIncludeDirs android.Paths) (string, android.Paths) { aidlIncludes := android.PathsForModuleSrc(ctx, j.properties.Aidl.Local_include_dirs) aidlIncludes = append(aidlIncludes, android.PathsForSource(ctx, j.properties.Aidl.Include_dirs)...) var flags []string + var deps android.Paths + if aidlPreprocess.Valid() { flags = append(flags, "-p"+aidlPreprocess.String()) + deps = append(deps, aidlPreprocess.Path()) } else { flags = append(flags, android.JoinWithPrefix(aidlIncludeDirs.Strings(), "-I")) } @@ -604,7 +602,7 @@ func (j *Javadoc) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Op flags = append(flags, "-I"+src.String()) } - return flags + return strings.Join(flags, " "), deps } func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths, @@ -615,7 +613,7 @@ func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths, for _, srcFile := range srcFiles { switch srcFile.Ext() { case ".aidl": - javaFile := genAidl(ctx, srcFile, flags.aidlFlags) + javaFile := genAidl(ctx, srcFile, flags.aidlFlags, flags.aidlDeps) outSrcFiles = append(outSrcFiles, javaFile) case ".sysprop": javaFile := genSysprop(ctx, srcFile) |