diff options
| author | 2019-04-22 16:48:35 +0000 | |
|---|---|---|
| committer | 2019-04-22 16:48:35 +0000 | |
| commit | e928452f307a95ad1d83443184f40019fdae2be4 (patch) | |
| tree | eec7e064a6d3374bd7f0830f81751220233620b8 /java/sdk_library.go | |
| parent | 8bf9bd9f913055784418e5fb7eace21942cae422 (diff) | |
| parent | 109328714ff626446e16cfdd3103a5b969284841 (diff) | |
Merge "Allow codename.fingerprint format for targetSdkVersion"
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index c60a8a00e..72c5cfc27 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -402,7 +402,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc props.Sdk_version = proptools.StringPtr(module.sdkVersion(apiScope)) props.Libs = module.sdkLibraryProperties.Stub_only_libs // Unbundled apps will use the prebult one from /prebuilts/sdk - if mctx.Config().UnbundledBuildPrebuiltSdks() { + if mctx.Config().UnbundledBuildUsePrebuiltSdks() { props.Product_variables.Unbundled_build.Enabled = proptools.BoolPtr(false) } props.Product_variables.Pdk.Enabled = proptools.BoolPtr(false) @@ -612,7 +612,7 @@ func (module *SdkLibrary) PrebuiltJars(ctx android.BaseContext, sdkVersion strin // to satisfy SdkLibraryDependency interface func (module *SdkLibrary) SdkHeaderJars(ctx android.BaseContext, sdkVersion string) android.Paths { // This module is just a wrapper for the stubs. - if ctx.Config().UnbundledBuildPrebuiltSdks() { + if ctx.Config().UnbundledBuildUsePrebuiltSdks() { return module.PrebuiltJars(ctx, sdkVersion) } else { if strings.HasPrefix(sdkVersion, "system_") { @@ -628,7 +628,7 @@ func (module *SdkLibrary) SdkHeaderJars(ctx android.BaseContext, sdkVersion stri // to satisfy SdkLibraryDependency interface func (module *SdkLibrary) SdkImplementationJars(ctx android.BaseContext, sdkVersion string) android.Paths { // This module is just a wrapper for the stubs. - if ctx.Config().UnbundledBuildPrebuiltSdks() { + if ctx.Config().UnbundledBuildUsePrebuiltSdks() { return module.PrebuiltJars(ctx, sdkVersion) } else { if strings.HasPrefix(sdkVersion, "system_") { |