Merge "Enforce hidden api usage in vendor (soong)"

This commit is contained in:
Treehugger Robot
2019-07-01 02:06:57 +00:00
committed by Gerrit Code Review
4 changed files with 43 additions and 4 deletions

View File

@@ -23,6 +23,7 @@ import (
"strings"
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
)
var (
@@ -520,7 +521,7 @@ func JavadocHostFactory() android.Module {
var _ android.OutputFileProducer = (*Javadoc)(nil)
func (j *Javadoc) sdkVersion() string {
return String(j.properties.Sdk_version)
return proptools.StringDefault(j.properties.Sdk_version, defaultSdkVersion(j))
}
func (j *Javadoc) minSdkVersion() string {