openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add no_standard_libs property to droidstubs 

am: 5994b620f2

Change-Id: Ia302462c2bf348a4fb4ec81c72ac0b65df3cd800
This commit is contained in:
Nan Zhang 2018-09-25 10:18:36 -07:00 committed by android-build-merger
parent 82b39d59df 5994b620f2
commit aee8fb0379
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
java/droiddoc.go
View File

@ -160,6 +160,10 @@ type JavadocProperties struct {
// list of java libraries that will be in the classpath. // list of java libraries that will be in the classpath.
Libs []string `android:"arch_variant"` 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, // don't build against the framework libraries (legacy-test, core-junit,
// ext, and framework for device targets) // ext, and framework for device targets)
No_framework_libs *bool No_framework_libs *bool
@ -477,20 +481,22 @@ func (j *Javadoc) minSdkVersion() string {
func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) { func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {
if ctx.Device() { if ctx.Device() {
sdkDep := decodeSdkDep(ctx, sdkContext(j)) if !Bool(j.properties.No_standard_libs) {
if sdkDep.useDefaultLibs { sdkDep := decodeSdkDep(ctx, sdkContext(j))
ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...) if sdkDep.useDefaultLibs {
if ctx.Config().TargetOpenJDK9() { ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...)
ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules) 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...)
} }
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...)
} }
} }