diff options
| author | Colin Cross <ccross@android.com> | 2019-04-18 14:27:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-22 10:08:35 -0700 |
| commit | 5c87791a78fc31620b165300c7976d8cf5674f9c (patch) | |
| tree | 256ca17a5e27c087a66107b04e38b6efa03f172b /java/sdk_library.go | |
| parent | 9bdfaf059105ab75bd4ca99629ce02659fe850fd (diff) | |
| download | android_build_soong-5c87791a78fc31620b165300c7976d8cf5674f9c.tar.gz android_build_soong-5c87791a78fc31620b165300c7976d8cf5674f9c.tar.bz2 android_build_soong-5c87791a78fc31620b165300c7976d8cf5674f9c.zip | |
Allow codename.fingerprint format for targetSdkVersion
Use codename.fingerprint format for targetSdkVersion if it is unset
in the manifest and UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.
Test: manual
Bug: 130541924
Change-Id: I4e3b1274cc32038b00b292dc6d67559eb320e9e4
Merged-In: I4e3b1274cc32038b00b292dc6d67559eb320e9e4
(cherry picked from commit 109328714ff626446e16cfdd3103a5b969284841)
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 72cce579..dc7da334 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -409,7 +409,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.TopDownMutatorContext, 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) @@ -619,7 +619,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_") { @@ -635,7 +635,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_") { |