aboutsummaryrefslogtreecommitdiffstats
path: root/java/droiddoc.go
diff options
context:
space:
mode:
authorNan Zhang <nanzhang@google.com>2018-09-21 16:39:51 -0700
committerColin Cross <ccross@android.com>2018-09-25 17:02:10 +0000
commit5994b620f26885879384c7999b16e9c58e6ac0ca (patch)
treec12c9d65530ce7c7070ee33a25d8d76440565e48 /java/droiddoc.go
parent3013361546639bf18cfcd5ea6bd782b3d552acd9 (diff)
downloadandroid_build_soong-5994b620f26885879384c7999b16e9c58e6ac0ca.tar.gz
android_build_soong-5994b620f26885879384c7999b16e9c58e6ac0ca.tar.bz2
android_build_soong-5994b620f26885879384c7999b16e9c58e6ac0ca.zip
Add no_standard_libs property to droidstubs
mainline-modules need this support to strip default libs. Test: N/A Bug: b/78245848 Change-Id: I8605019a55dd8f724c863ddaa705b72f461a7cb2
Diffstat (limited to 'java/droiddoc.go')
-rw-r--r--java/droiddoc.go32
1 files changed, 19 insertions, 13 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 2ab0d312..e9b7c0e1 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -160,6 +160,10 @@ type JavadocProperties struct {
// list of java libraries that will be in the classpath.
Libs []string `android:"arch_variant"`
+ // don't build against the default libraries (bootclasspath, legacy-test, core-junit,
+ // ext, and framework for device targets)
+ No_standard_libs *bool
+
// don't build against the framework libraries (legacy-test, core-junit,
// ext, and framework for device targets)
No_framework_libs *bool
@@ -477,20 +481,22 @@ func (j *Javadoc) minSdkVersion() string {
func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {
if ctx.Device() {
- sdkDep := decodeSdkDep(ctx, sdkContext(j))
- if sdkDep.useDefaultLibs {
- ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...)
- if ctx.Config().TargetOpenJDK9() {
- ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules)
- }
- if !Bool(j.properties.No_framework_libs) {
- ctx.AddVariationDependencies(nil, libTag, config.DefaultLibraries...)
- }
- } else if sdkDep.useModule {
- if ctx.Config().TargetOpenJDK9() {
- ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)
+ if !Bool(j.properties.No_standard_libs) {
+ sdkDep := decodeSdkDep(ctx, sdkContext(j))
+ if sdkDep.useDefaultLibs {
+ ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...)
+ if ctx.Config().TargetOpenJDK9() {
+ ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules)
+ }
+ if !Bool(j.properties.No_framework_libs) {
+ ctx.AddVariationDependencies(nil, libTag, config.DefaultLibraries...)
+ }
+ } else if sdkDep.useModule {
+ if ctx.Config().TargetOpenJDK9() {
+ ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)
+ }
+ ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.modules...)
}
- ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.modules...)
}
}