StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "droiddoc supports no_framework_libs." am: 984285de31

Browse Source 
am: 3e94af80a1

Change-Id: I5624a706fd917da83c9dc44f07ad41463d5c9c9d
This commit is contained in:
Nan Zhang
2018-03-06 23:43:58 +00:00
committed by android-build-merger
parent 3ae73c7ee6 3e94af80a1
commit c88d07b75a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/droiddoc.go
View File

@@ -73,6 +73,10 @@ type JavadocProperties struct {
// list of of java libraries that will be in the classpath. // list of of java libraries that will be in the classpath.
Libs []string `android:"arch_variant"` Libs []string `android:"arch_variant"`
// don't build against the framework libraries (legacy-test, core-junit,
// ext, and framework for device targets)
No_framework_libs *bool
// If set to false, don't allow this module(-docs.zip) to be exported. Defaults to true. // If set to false, don't allow this module(-docs.zip) to be exported. Defaults to true.
Installable *bool `android:"arch_variant"` Installable *bool `android:"arch_variant"`
@@ -183,7 +187,9 @@ func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {
sdkDep := decodeSdkDep(ctx, String(j.properties.Sdk_version)) sdkDep := decodeSdkDep(ctx, String(j.properties.Sdk_version))
if sdkDep.useDefaultLibs { if sdkDep.useDefaultLibs {
ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...) ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...)
ctx.AddDependency(ctx.Module(), libTag, []string{"ext", "framework"}...) if Bool(j.properties.No_framework_libs) {
ctx.AddDependency(ctx.Module(), libTag, []string{"ext", "framework"}...)
}
} else if sdkDep.useModule { } else if sdkDep.useModule {
ctx.AddDependency(ctx.Module(), bootClasspathTag, sdkDep.module) ctx.AddDependency(ctx.Module(), bootClasspathTag, sdkDep.module)
} }