diff options
| author | 2020-03-02 16:58:11 +0000 | |
|---|---|---|
| committer | 2020-03-04 22:05:11 +0000 | |
| commit | 1f4f345156b999042c46b998bdf7030c0e60a1f1 (patch) | |
| tree | 252f93309e4bcfee2965c465876215bcced5ef40 /java/sdk.go | |
| parent | ea1fcb630f0da83ff2db1b2c456f5df49fd7a8f5 (diff) | |
Always use "${codename}.${sha}" if UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true
Test: m checkbuild
Bug: 149733822
Change-Id: I3e1beeb721f7e87bc6adda61861fa962ec892360
Merged-In: I3e1beeb721f7e87bc6adda61861fa962ec892360
(cherry picked from commit 934c4f2accc40374ec470c5bca8bd72a64509cc7)
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/sdk.go b/java/sdk.go index 1e60d6774..20a077230 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -50,9 +50,8 @@ type sdkContext interface { targetSdkVersion() sdkSpec } -func UseApiFingerprint(ctx android.BaseModuleContext, v string) bool { - if v == ctx.Config().PlatformSdkCodename() && - ctx.Config().UnbundledBuild() && +func UseApiFingerprint(ctx android.BaseModuleContext) bool { + if ctx.Config().UnbundledBuild() && !ctx.Config().UnbundledBuildUsePrebuiltSdks() && ctx.Config().IsEnvTrue("UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT") { return true |