diff options
| author | 2020-03-11 17:45:34 +0000 | |
|---|---|---|
| committer | 2020-03-11 17:45:34 +0000 | |
| commit | 643953d17016ae6e62af7b43dba29fee33510fa2 (patch) | |
| tree | 915a8f5b4c9e12955b8f7792e34b89af17fc6690 /java/sdk.go | |
| parent | de7790448462fb402794ccdfddd53adcca2d6a1b (diff) | |
| parent | 1f4f345156b999042c46b998bdf7030c0e60a1f1 (diff) | |
Merge "Always use "${codename}.${sha}" if UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true"
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 d230ccd96..ded2a061b 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 |